Re: pulling and rebasing. Problem with resolving conflict

[Janek Warchoł]

2011/8/22 Reinhold Kainhofer <address@hidden>:
> Am Sunday, 21. August 2011, 23:43:21 schrieb Janek Warchoł:
>> address@hidden:~/lilypond-git$ git status
>> ##now this looks strange - shouldn't it say something like "modified:
>> this, this and this"?
>
> Nope, after you manually resolved all conflicts of the rebase, the conflicting
> patch does not have any changes left (because you removed everything that the
> patch would have changed). So you can't say "git rebase --continue", because
> there is nothing in that patch any more. You rather have to skip this with
> "git rebase --skip", because in git you can't[*] have a commit without any
> changes.

Ah, silly me!  How come that i stopped thinking recently? :)

Thanks!
Janek