Very strange git behavior when merging old branch into development

Basically, I am merging the old commit into a development branch, there were conflicts, and when I fixed the conflicts, I noticed that I was missing a few files from my working directory that I created after the last common ancestor. Here's what my story looked like before the merger: enter image description here

And this is how it looked after: enter image description here

Although I noticed that there is no explicit dashed line that connects Eto Headin the output git log --graph --decorate --oneline --all, but I think it’s only because I haven’t merged yet ... Now, I think I don’t see new files because I haven’t made a merge, I will check whether this behavior is valid.

, : , B, D's, Head, , B Head.

, ?

+4
1

. , XCode 8.2 , , . , Finder, XCode , , XCode - XCode .

, , XCode , .

XCode.

+1

Source: https://habr.com/ru/post/1672077/


All Articles