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 (u
Hi Raghavendra ,
AFAIK , you need to solve it manually and do git commit after this.
This happens when git tries to resolve it but does know how to solve
the same. Git will record the conflict resolution that you have done
and in case the same kind of conflict occurs, it will resolve the
conflict
> Now my question is that do I need to solve the merging issue manually or
> is there any way to solve this using git?
This is in no way related to the Linux kernel. You should be asking
this on the git mailing list.
Short answer - you will have to manually fix the conflict. Git could
not do it a
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 th
