Comment 1 for bug 827925

Revision history for this message
Jonathan Riddell (jr) wrote : Re: How to handle a merge

There's no need to do a commit before other changes, although you can if you like. The upstream changes are already in the upstream branch and you are left with a merge from that branch into the trunk packaging branch. bzr qlog might clarify this for you.