[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: How to handle Debian patches

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'.


Reply to: