pulling and rebasing. Problem with resolving conflict

[Janek Warchoł]

Hi,

I don't understand what happens (and why) when i try to update one of
my local branches.
Here's the background: i made a branch and applied a patch done by
Keith to it.  Later a modified version of Keith's patch was pushed to
origin/master (i guess).  Now I try to pull and rebase and a conflict
appears; when i try to solve it something strange happens:

address@hidden:~/lilypond-git$ git pull -r
First, rewinding head to replay your work on top of it...
Applying: new keith, works with fullmeasure   #that's how i named
keith's patch when i applied and committed it
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging input/regression/tablature-full-notation.ly
CONFLICT (content): Merge conflict in
input/regression/tablature-full-notation.ly
Auto-merging lily/include/staff-spacing.hh
CONFLICT (content): Merge conflict in lily/include/staff-spacing.hh
Auto-merging lily/spacing-spanner.cc
CONFLICT (content): Merge conflict in lily/spacing-spanner.cc
Auto-merging scm/define-grobs.scm
Failed to merge in the changes.
Patch failed at 0001 new keith, works with fullmeasure

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

address@hidden:~/lilypond-git$ git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      input/regression/tablature-full-notation.ly
#       both modified:      lily/include/staff-spacing.hh
#       both modified:      lily/spacing-spanner.cc
#
no changes added to commit (use "git add" and/or "git commit -a")

#<edit above files, save them>

address@hidden:~/lilypond-git$ git add
input/regression/tablature-full-notation.ly
address@hidden:~/lilypond-git$ git add lily/include/staff-spacing.hh
address@hidden:~/lilypond-git$ git add lily/spacing-spanner.cc

address@hidden:~/lilypond-git$ git status
##now this looks strange - shouldn't it say something like "modified:
this, this and this"?
# Not currently on any branch.
nothing to commit (working directory clean)
address@hidden:~/lilypond-git$ git commit -a -m meeeef
# Not currently on any branch.
nothing to commit (working directory clean)
address@hidden:~/lilypond-git$ git rebase --abort
HEAD is now at 247d56b new keith, works with fullmeasure

What is happening?  Maybe it has soemthing to do with recent juggling
caused by problems with git push and pull?

cheers
Janek