In what case can a conflict with a headache of ~ 10 occur?

I have a case where just executing git rebase HEAD~10causes multiple merge conflicts.

As I understand it, the above command should return to HEAD~10, and then cherry-pickwith each subsequent commit without any changes, thus simply repeating the story.

How is this possible to create merge conflicts?

I will not post a specific case, since I do not want to turn this question into a specific solution to problems (I really have no reason to do this rebase), but I'm rather trying to understand how git works.

EDIT:

Adding network diagrams to better illustrate the situation. Conflict occurs when rebase gets to the point that “More Tests” commits

Network

+4
2

, , 10 . Rebasing , --preserve-merges/-p , , , .

+1

" ?, :

git config merge.conflictstyle diff3

( ), .

- .
, , ... .
( , ?" )

0

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


All Articles