2017-07-11 10:06 GMT+08:00 Anjaiah Yamagani <anjiyt...@gmail.com>: > 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. > > Now while we try to push the code to the Master it shows conflicts, how to > avoid this.
1. commit on branch INT. 2. checkout master 3. merge that commit into master from INT 4. if there are any conflicts, resolve it and commit Thoughts? /Yubin > 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.
