From: Johannes Schindelin Date: Thu, 01 Nov 2007 14:24:37 GMT Subject: Re: Newbie: report of first experience with git-rebase. Message-ID: In-Reply-To: <87ve8m2mfn.fsf@osv.gnss.ru> Hi, On Thu, 1 Nov 2007, Sergei Organov wrote: > Junio C Hamano writes: > > > Johannes Schindelin writes: > > > >> On Wed, 31 Oct 2007, Sergei Organov wrote: > >> > >>> Yes, and that's the problem. Why 'git --continue' didn't just skip this > >>> patch that *already became no-op* after conflict resolution and forced > >>> me to explicitly use 'git --skip' instead? > >> > >> Isn't that obvious? To prevent you from accidentally losing a commit. > > > > In case it is not obvious... > > > > A rebase conflict resolution that results in emptiness is a > > rather rare event (especially because rebase drops upfront the > > identical changes from the set of commits to be replayed), but > > it does happen. > > Funny how 2 of my first 3 commits suffer from this "rather rare event", > and it was not Friday, 13 ;) They are rare events. In your case I guess that subtly different versions were _actually_ applied (such as white space fixes), which is why such a rare event hit you. Ciao, Dscho