Re: git-buildpackage pattern question
On 03/21/2016 09:43 PM, Sean Whitton wrote:
> When there's a new release, I fetch upstraem's tags and then run
> something like `git merge 1.1.1 && dch -v1.1.1`. In the case you
> describe where 1.1.1 cannot be cleanly merged with 1.0.2, I would just
> run `git merge --strategy recursive --strategy-option theirs 1.1.1 &&
> dch -v1.1.1` which is similar to what Russ suggests, though it avoids
> overwriting anything in debian/. This will always work because all my
> modifications are quilt patches so it's okay to overwrite anything
> outside of debian/ with the newer upstream version.
Finally got a time to do a test run - so far, this seems awesome.
Thanks Sean and Russ for the suggestions and great explanation!
Ross
Reply to: