Changes between Version 22 and Version 23 of UsingPidginMonotone

Timestamp:

May 1, 2007, 3:17:48 AM (17 years ago)

Author:

jeff

Comment:

explicit_merge

UsingPidginMonotone

@@ -76 +76 @@
 ==== Merging branches ====
 
-Merging two branches is accomplished with the command {{{mtn propagate <from-branch> <to-branch>}}}.  There are other ways to merge (''e.g.'', approve or cert a revision onto the destination branch, and then handle as a micro-branch below), but this is the most straightforward and will normally serve your purposes.
+Merging two branches is accomplished with the command {{{mtn propagate <from-branch> <to-branch>}}}.  There are other ways to merge (''e.g.'', approve or cert a revision onto the destination branch, and then handle as a micro-branch below), but this is the most straightforward and will normally serve your purposes. If required, mtn [http://monotone.ca/docs/Tree.html#index-mtn-explicit_005fmerge-_0040var_007bid_007d-_0040var_007bid_007d-_0040var_007bdestbranch_007d-12 explicit_merge] provides more control.
 
 === micro-branches ===