From: Bert Wesarg Date: Tue, 12 Aug 2008 18:54:00 GMT Subject: Re: TopGit: problem with patch series generation Message-ID: <36ca99e90808121154l1f7978a1v4de40d990005cb0e@mail.gmail.com> In-Reply-To: <32541b130808120925y663967ebm38eced6df77ffe4@mail.gmail.com> On Tue, Aug 12, 2008 at 18:25, Avery Pennarun wrote: > On Tue, Aug 12, 2008 at 12:18 PM, martin f krafft wrote: >> As I am packaging TopGit for Debian, I encountered >> the situation that two branches conflict with each other (they >> change the same line), but there is no dependency between the >> branches. Thus, when I squash the branches into a series, the >> resulting patches will not apply (they both change the same original >> line to something else). > > Isn't this what git-rerere is for? If TopGit doesn't use rerere, > maybe it would be easy to add... I thought about this too, but have no experience with rerere. Bert > > Have fun, > > Avery > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >