Does the order of Git merging matter?

后端 未结 5 694
不知归路
不知归路 2020-12-29 05:33

Suppose I have two branches, A and B. Do the following properties hold?

  • Merging A into B conflicts if and
5条回答
  •  礼貌的吻别
    2020-12-29 06:21

    Merge conflicts happen when two people change the same lines in the same file, or if one person decided to delete it while the other person decided to modify it.

    So basically,

    • If there are conflicts when you try to merge B to A, there will be conflicts when you try to merge A to B.

    • The result of merging A into B and B into A has to be the same(if there are no conflicts).

    The question is purely logical. So if anyone thinks my logical answer is wrong or needs improvement, feel free to correct me or edit this.

提交回复
热议问题