Guillem Jover <[EMAIL PROTECTED]> writes: > On Fri, 2008-05-16 at 15:49:25 -0700, Russ Allbery wrote:
>> That would work, although it does... well, not double, but at least >> increase the work for any branch that also has a submission branch, >> since any upstream merge conflicts have to be resolved on both >> branches. Or is there some way to reuse the resolution work done with >> one of those branches when rebasing/merging the other? > Check 'man git-rerere'. Oh, wow. Yes, that looks like exactly what I'm looking for. -- Russ Allbery ([EMAIL PROTECTED]) <http://www.eyrie.org/~eagle/> -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
