On Tue, Aug 12, 2008 at 18:25, Avery Pennarun <[EMAIL PROTECTED]> wrote:
> On Tue, Aug 12, 2008 at 12:18 PM, martin f krafft <[EMAIL PROTECTED]> 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.

> Have fun,
> Avery
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to [EMAIL PROTECTED]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

vcs-pkg-discuss mailing list

Reply via email to