Changes between Version 3 and Version 4 of BazaarWorkflow


Ignore:
Timestamp:
2009-08-16T18:33:29Z (15 years ago)
Author:
Jiri Svoboda
Comment:

Structured history is good.

Legend:

Unmodified
Added
Removed
Modified

  • BazaarWorkflow

    v3 v4  
    4343== Structured History ==
    4444
     45Stuctured 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
    4547If 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.
    4648