If you really want to stay on the safe side, this would be the easiest and safest for you.
git checkout branchX git checkout -b branchX-merge-master git merge master fix any conflicts, do your tests. Commit conflict changes. When you are happy, repeat git merge master Until everything is up to date. This is just if any commits are added to master in the meantime. When you are very happy git checkout master git merge branchX-merge-master And voilà. Hope everything is clear. I am typing on a phone. If you need more details or explanations, i'll get on a computer and give a more detail step by step. HD. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
