Safe way to merge my branch

Question

I have master branch and I have xx1 branch with 3 commits ahead (changes in file A) and 5 commits behind master (changes in file B) What is the safe way to merge xx1 branch to master branch ? should I merge first master to xxx1 ? or because files are different I can just merge my branch to master ?

Typically, it is strange to speak of an individual _file_ as being ahead or behind another branch, rather an entire _branch_ is ahead of behind. Are you using a tool such as GitHub? — Tim Biegeleisen, Nov 03 '16 at 10:14

score 1 · Accepted Answer · answered Nov 03 '16 at 10:15

1

Theoretically yes. You can merge and there might not be any merge conflicts as you said the files are different.

However, you can also rebase, which is a better option in my opinion. Rebase will make sure that all the commits are maintained individually.

https://git-scm.com/docs/git-rebase

answered Nov 03 '16 at 10:15

Prabodh Mhalgi

805
9
25

do you mean I can merge xx1 to master without merging first master to xx1? – Imanez Nov 03 '16 at 10:33
1

I don't see a reason why you cannot do that. However, that is not the best practice. – Prabodh Mhalgi Nov 04 '16 at 05:39

Safe way to merge my branch

1 Answers1

Linked