From: Jakub Narebski Date: Sun, 08 Feb 2009 12:34:42 GMT Subject: Re: [PATCHv3 1/3 (resend)] gitweb: Modularized git_get_project_description to be more generic Message-ID: <200902081334.42780.jnareb@gmail.com> In-Reply-To: <87tz75p3ej.wl%seb@cine7.net> Dnia niedziela 8. lutego 2009 12:35, Sébastien Cevey napisał: > At Sun, 8 Feb 2009 12:10:48 +0100, Jakub Narebski wrote: > > > Due to changes to gitweb, while first patch in (earlier version of) > > series applies cleanly, second patch didn't, and git could not find > > base to fall back to 3-way merge (because second patch is based on > > state after first patch, and situation after first patch changed). > > It is much easier to rebase series if youhave them as commits, and > > not as series of emails. > > Sure, I'll make sure of being rebased onto git master HEAD (or should > I rebase onto another development branch?) next time. But is this > resend properly merging and working for you? They got imported correctly, at least. Thanks again! -- Jakub Narebski Poland