How do criss-cross merges arise in Git?

后端 未结 4 712
故里飘歌
故里飘歌 2020-12-17 23:24

I have been going through the, \"git merge-base\", man page and I can\'t understand how multiple merge bases develop. Specifically, I\'m hung up on the following illustratio

4条回答
  •  时光说笑
    2020-12-18 00:03

    This happens when the other developer fetches commits from you, you fetch from them, and then you both merge each other's branches into your own after you've both fetched. That can happen, it's not an error state.

提交回复
热议问题