Does the order of Git merging matter?

Question

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

• Merging A into B conflicts if and

Answer 1

Consider A to be the master branch and B to be the sub branch.

1. Now create a readme.txt file and add some content i.e, "change 1" stage it and commit it.
2. Now create another sub branch B, make some changes to readme.txt i,e append "change 2" to readme.txt and commit it.
3. Switch back to Master branch A, now you'll not see any changes made by sub branch B. To reflect the same changes made by B merge from the master branch i.e, from B into A
4. Once your are there in master branch A, append "change 3" to readme.txt file and commit it.
5. Now checkout to sub branch B, append "change 4" to readme.txt and commit the changes that you have made
6. Once when you were there in sub branch B, merging the master branch A into sub branch B causes Merge Conflicts

Since you'll not see the text "change 3" in readme.txt file from sub branch B, and you are not appending the text "change 4" to readme.txt file. Instead you are overwriting the readme.txt i.e, by merging the contents of the text readme.txt having "change 3" to the text "change 4"

From the above example both the properties holds good.