Changes between Version 3 and Version 4 of BazaarWorkflow
- Timestamp:
- 2009-08-16T18:33:29Z (15 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
BazaarWorkflow
v3 v4 43 43 == Structured History == 44 44 45 Stuctured history is '''good'''. If you are working on some feature and produce several related commits, it is better to group them to a separate branch. Also, with Bazaar it is not uncommon to have long-running branches (that are merged after weeks, months). Do not be afraid of structured history. 46 45 47 If your branch diverged from the mainline (i.e. somebody pushed to the main repository since you branched off), you cannot push anymore. You must merge the two branches. With merging, the order of arguments is significant. You must always ''merge your branch into the mainline'', never the other way around! How can you do this? With bazaar you can only merge to a local repository (you need to chdir into it), you cannot merge to a remote repository. 46 48