Quote:
Originally Posted by kiwidude
Apologies for being a newbie to using Bazaar but here's the scenario.
|
For a long time I just made my changes to the branch from the main trunk, committed my changes, then merged from the trunk. Sometimes I'd have to resolve a conflict manually.
Now I keep 1) a clean local copy of the trunk and 2) a branch made from the clean local copy (where I make my changes). When I want to update, I first do a merge in the clean copy (from the trunk), then commit that merge, then merge from the local copy into my modified local branch, then commit that merge. This lets me run from my modified source or from the trunk source.
You have to commit changes before the merge. It's all done with a batch file.