From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Fri, 01 Dec 2006 07:30:25 GMT
Subject: Re: Resolving conflicts
Message-ID: <200612010730.25700.alan@chandlerfamily.org.uk>
In-Reply-To: <456FD461.4080002@saville.com>

On Friday 01 December 2006 07:06, Wink Saville wrote:
...
>    git-pull . master
>
> But that failed:
I am not the worlds expert in this, but since most seem to be in bed I'll 
attempt to answer you

...
>    CONFLICT (content): Merge conflict in kernel/fork.c
>    Auto-merging kernel/spinlock.c
>    CONFLICT (content): Merge conflict in kernel/spinlock.c

These show that these two files had some conflicts in the contents from the 
kernel and your local branch
...
> And git-status shows:
...
>    # Changed but not updated:
>    #   (use git-update-index to mark for commit)
>    #
>    #       unmerged: kernel/fork.c
>    #       modified: kernel/fork.c
>    #       unmerged: kernel/spinlock.c
>    #       modified: kernel/spinlock.c
>    #
>
> So what have I done wrong?

Nothing - its asking you to manually resolve the conflict.  

> Did the pull complete and I just need to resolve this or
> do I need to redo the git-pull?

Take a look in these two files - you should see conflict markers of the form
<<<<<<<<<<<<<<<< 
some content
================
some other content
>>>>>>>>>>>>>>>>

which is the contents that failed from your side and the new version of the 
kernel you pulled in.

Edit so the files have sensible content

then use

git update-index <filename>

to tell git that that particular conflict has been resolved.


When you have done that for both files

just do 

git commit







-- 
Alan Chandler