Hello Nikolaus, On Thu, Jan 05, 2017 at 03:59:40PM -0800, Nikolaus Rath wrote: > On Jan 05 2017, Sean Whitton <spwhitton@spwhitton.name> wrote: > > On Thu, Jan 05, 2017 at 12:39:25PM -0800, Nikolaus Rath wrote: > >> But, as far as I can tell, doing this work up-front is much easier: > > > > Yes, but you have to do it every single time you make changes that you > > want to be able to push (i.e. more than once per upload). > > What do you mean with "it"? You don't have to resolve any conflicts > unless you update to a new upstream that conflicts with your patches, or > unless you change a patch in such a way that it conflicts with a > different patch. Sorry to have been unclear. I meant the `gbp import`, (at a minimum) check things are right, `gbp export` dance. This is a lot more work than `git commit`! -- Sean Whitton
Attachment:
signature.asc
Description: PGP signature