Git GUI - Switching between branches with deleting and restoring files

In general, I need to switch files from Vetka1 to Vetku2 that are not used by Vetku2 and create those that are used by it.

In general, this is what happens. Let's start with the terminology to understand each other exactly.

A branch is just a lightweight commit pointer. It is implemented simply as a file, and the commit number (SHA-1) is in the file. Switching to another branch you actually switch to another commit.

Files and folders are not used by a branch or commit. It is more correct to say that the file (or a specific state of the file) belongs to a commit or is stored in a commit.

Commit inside contains the structure of files and folders that were saved in it, including the contents of files. At its core, this is such a "picture" of the working area of ​​your project.

When switching to another commit, all files and folders are rebuilt to the state that was saved in that commit. Let's imagine that we have two branches: master and feature and consider different situations. Here letters are different commits.

  D feature / A--B--C/--E master* 

We are in master and switch to feature:

 git checkout feature 

Suppose we have some file. Denote its content in commits C, D, E, in the project workspace (working tree, wt ) and the result of checkout 'a (or his attempts).

• x - file deleted
• 1 , 2 , 3 - various content options

 | C | E | D | wt | Результат --------------------------------------------------------------------- | 1 | 1 | 1 | 1 | 1, без изменений | 1 | 1 | 1 | 2 | 2, несохранённое изменение останется | 1 | 1 | 3 | 1 | 3, терять нечего, содержимое просто меняется | 1 | 2 | 1 | 2 | 1, аналогично | 1 | 2 | 3 | 2 | 3, аналогично. # итог: если последнее состояние файла закоммичено (E == wt), # конфликтов никогда не будет | 1 | 1 | 2 | 3 | Fail, будет потеря несохранённых изменений | 1 | 2 | 2 | 3 | 3, git распознаёт, что изменения в коммитах одинаковы. | 1 | 2 | 3 | 3 | Fail. Текущее состояние файла равно сохранённому в D, # но с точки зрения текущего коммита это потеря несохранённых изменений. | 1 | 2 | 1 | 3 | Fail. Даже если файл менялся только в одном коммите, # нельзя применить изменение "2" -> "3" к содержимому "1" # теперь поудаляем. | C | E | D | wt | Результат --------------------------------------------------------------------- | 1 | x | 1 | x | 1. Файл восстановлен, как раз то что вам нужно. | 1 | 1 | x | 1 | x. В той ветке файл удалён. | 1 | 1 | x | 2 | Fail, потеря изменений. | 1 | 1 | 2 | x | Fail, удаление - это тоже изменение. | 1 | 1 | 1 | x | x, изменение есть, но конфликта нет. # Файл независимо появился в разных ветках | x | 1 | 1 | 1 | 1, всё нормально | x | 1 | 2 | 1 | 2, даже если содержимое разное | x | 1 | 2 | 2 | Fail, снова потеря, хоть содержимое и совпадает. 

Total, the result of the checkout for each file can be described with the following pseudocode:

 if (E == wt) { // Если нет несохранённых изменений, берём содержимое из D return D } else if (E == D) { // Если содержимое не менялось (или менялось одинаково), // То можно оставить текущее содержимое файла return wt } else { // Иначе вероятна потеря данных fail() } 

What can be done with unsaved changes:

1. Check in
2. Fold in pocket .
3. Cancel using
   • git reset --hard -- filename - in one file
   • git reset --hard - undo all changes to versioned (tracked) files
   • git clean -f - generally clean the workspace, including deleting unversioned files. C -fx will also remove ignored files, with -fd take directories, not just files. Option -fdx - napalm burning of everything that is not nailed.

With git checkout %branch_name% status of the monitored files in the repository changes to the state of the extreme commit of this branch (i.e., the extra files will disappear, and the necessary files will be added). Modified and new (not fixed) files remain hanging.

You can also run git clean -dfx to clear the repository from untracked folders and files.

if the files 'manually' are not registered and do not lie in the index in branch1, then in order to save them you need to put them on the shelf on demand by the command

git stash save --include-untracked "имя полки"

After that, switch to branch2. To view all the sticks, you need to use

 git stash list 

To extract the files you need to run

git stash apply "stash@{0}"

Need to use the desired index

The transition from branch2 is similar