ubuntu-packaging-guide-team team mailing list archive

[Barry Warsaw <barry@xxxxxxxxxx>]

On Aug 17, 2011, at 10:33 AM, Christophe Sauthier \(huats\) wrote:

>I am still not confortable what to do right  after I used the command
>bzr merg-upstream.
>
>Indeed my branch contains the new upstream version, but should I do a
>commit for that before I start twikking on the debian/ dir or not ?

While a commit is not strictly necessary, I think it's "best practice" because
it separates the changes that occurred due to the merge, from the changes you
make post-merge.  I find this helpful in case you make mistakes post-merge;
it's easier to figure out what you touched.

Attachment: signature.asc
Description: PGP signature