[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: pulling and rebasing. Problem with resolving conflict

From: Reinhold Kainhofer
Subject: Re: pulling and rebasing. Problem with resolving conflict
Date: Mon, 22 Aug 2011 00:06:51 +0200
User-agent: KMail/1.13.6 (Linux/2.6.38-10-generic; KDE/4.7.0; i686; ; )

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 


[*] It is possible to have a commit without any changes, but I don't know any 
situation where you really want it. And you have to force git to create such a 
Reinhold Kainhofer, address@hidden,
 * Financial & Actuarial Math., Vienna Univ. of Technology, Austria
 *, DVR: 0005886
 * LilyPond, Music typesetting,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]