Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Suppose that I hav two git branches; branch_one and branch_two. If I merge these branches, will one of the two branches be considered more “up to date” that the other?
Is there a difference between git merge branch_one branch_two and git merge branch_two branch_one?
Thank you in advance.
It’s symmetric. Only during conflict it marks code as “their” “mine” differently. The merged branch tip will have changes from both branches, while other branch will be unchanged.
BTW, command
git merge b1 b2does octopus merge of two branches into a current HEAD, so the command merges three branches. But I guess it’s not what you meant, but just an illustration.