----- Original Message ----- From: Anjaiah Yamagani To: Git for human beings Sent: Tuesday, July 11, 2017 3:06 AM Subject: [git-users] How to avoid merge conflicts while merging INT changes into Master
Hi Team, I have very quick question - as I'm new to the git we have master branch. and checked out the INT branch from the master, worked on the INT for an month and all the developers pushed the code to INT , obviously INT branch ahead of comments then the master. One learning point is "Don't wait that long!". One of the benefits of git is that you can do test merges from master into INT (or a temporary branch from INT) to see how far the conflicts have developed, usually because master has moved on. If master has moved on, and you will need to merge back into master, try looking at the rebase command, which haelps you move yor fork point (merge-base) forward as master develops. If you currently have a big merge problem try looking for the "imerge" tool, which will help you see where the divergence happened, and allow you to save your progress as you go, so that you can come back to the issues later (useful if the team will take days to resolve all the conflicting changes). Now while we try to push the code to the Master it shows conflicts, how to avoid this. at this stage I do not want to see the conflicts and work with the developers at this stage and resolve the merge conflicts. can you suggest are we doing any wrong thing here. Regards, Anjaiah -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
