H
H
habrdima2020-06-11 12:17:37
git
habrdima, 2020-06-11 12:17:37

Why is there a conflict only from now on?

I do "git rebase master" being in the d branch, in the figure below the diagram and text of the file

5ee1f536177b4762549067.jpeg

commit k1 for line k1 at position 8, the master

branch branch d began with commit k3

Why if you make changes up to line 8 inclusive and even shift the text from line 9 down as in the figure above and rebase, the conflict does not arise, but if after for example "k2 d 2" does it occur?

this video says that git should look at the difference starting from k3, but in fact the k2 commit is also important for the rebase
https://www.youtube.com/watch?v=Du7Ay5o-Png&list=P...

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question