Changes between Version 29 and Version 30 of UsingPidginMonotone

Timestamp:

Oct 3, 2007, 10:11:58 PM (16 years ago)

Author:

resiak

Comment:

Mention $MTN_MERGE

UsingPidginMonotone

@@ -119 +119 @@
 === Content Conflicts ===
 
-A content conflict is when two revisions have edited the same file in close enough proximity that their diffs interfere with each other.  These cause {{{<<<<<}}} {{{=====}}} {{{>>>>>}}} blocks in CVS and Subversion.  In monotone, merges via the working directory are not yet supported; all conflicts must be resolved at merge time, and the resulting resolution will be directly committed to the revision database with no chance to edit anything else (for example, to resolve non-content-conflict logical consistency problems).  These content conflicts will be presented to you, one at a time, in a 3-way merge application.  This means that you'll have to have such an application installed; I have found that ''xxdiff'' and ''meld'' are more intuitive than some of the other options which monotone understands (such as emacs and vim merge modes).  These applications will show you the two sides of the merge conflict and the least common ancestor (the "closest" revision to the conflicting revisions, by revision hop count, computed via some clever algorithm) in separate panes, and you simply choose which stanzas you wish to include and which you wish to leave out, and make any necessary edits to make that happen.  This is a little bit tricky, but once you've done it a couple of times it becomes easier.
+A content conflict is when two revisions have edited the same file in close enough proximity that their diffs interfere with each other.  These cause {{{<<<<<}}} {{{=====}}} {{{>>>>>}}} blocks in CVS and Subversion.  In monotone, merges via the working directory are not yet supported; all conflicts must be resolved at merge time, and the resulting resolution will be directly committed to the revision database with no chance to edit anything else (for example, to resolve non-content-conflict logical consistency problems).  These content conflicts will be presented to you, one at a time, in a 3-way merge application.  This means that you'll have to have such an application installed; I have found that ''xxdiff'' and ''meld'' are more intuitive than some of the other options which monotone understands (such as emacs and vim merge modes).  These applications will show you the two sides of the merge conflict and the least common ancestor (the "closest" revision to the conflicting revisions, by revision hop count, computed via some clever algorithm) in separate panes, and you simply choose which stanzas you wish to include and which you wish to leave out, and make any necessary edits to make that happen.  This is a little bit tricky, but once you've done it a couple of times it becomes easier.  Set ```$MTN_MERGE``` to control which merge application is used.
 
 === Non-Content Conflicts ===