I suppose you are trying to execute the below commands. git checkout master git merge origin/INT (taking changes from remote branch) or git merge INT (merge with local changes) At this point you would have faced the conflicts. In this case, if you want to retain the changes of INT, you can take the changes from INT and apply it in master without opening the file and solving the conflicts. Execute the below command
git checkout --theirs <path/to/conflictfiles> git add <path/to/conflictfiles> Now, you can check in master branch for INT contents for conflicted file. On Tuesday, 11 July 2017 07:36:47 UTC+5:30, Anjaiah Yamagani wrote: > > 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. > > 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.
