http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts andi On 06/12/2014 07:16 AM, Raghavendra wrote: > Hello everyone, > > Assume that i have two branches in my repository: master and devel. > > -- I've updated the master branch from the remote repository (using git > pull). > Assume that the file name 'file.txt' has gone through an update. > > -- Now the same file has also gone through a modification in the devel > branch (manual editing) > > -- Now when I do a 'git merge master' from my devel branch, I am facing > a conflict issue something like this : > > Auto-merging file.txt > CONFLICT (content): Merge conflict in file.txt > Automatic merge failed; fix conflicts and then commit the result. > > Now my question is that do I need to solve the merging issue manually or > is there any way to solve this using git? > > Thank you. > Raghavendra > > ------------------------------------------------------------------------------------------------------------------------------- > [ C-DAC is on Social-Media too. Kindly follow us at: > Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ] > > This e-mail is for the sole use of the intended recipient(s) and may > contain confidential and privileged information. If you are not the > intended recipient, please contact the sender by reply e-mail and destroy > all copies and the original message. Any unauthorized review, use, > disclosure, dissemination, forwarding, printing or copying of this email > is strictly prohibited and appropriate legal action will be taken. > ------------------------------------------------------------------------------------------------------------------------------- > > > _______________________________________________ > Kernelnewbies mailing list > Kernelnewbies@xxxxxxxxxxxxxxxxx > http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies _______________________________________________ Kernelnewbies mailing list Kernelnewbies@xxxxxxxxxxxxxxxxx http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
