On Jan 05 2017, Sean Whitton <spwhit...@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.
Best,
-Nikolaus
--
GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F
»Time flies like an arrow, fruit flies like a Banana.«
