|
Size: 1304
Comment:
|
← Revision 14 as of 2012-11-11 18:40:24 ⇥
Size: 1193
Comment: remove links to deleted pages
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| A conflict occurs when two independent ["ChangeSet"]s modify overlapping sections of a file in different ways. During a ["Merge"], ["Mercurial"] may require the assistance of the user through a ["MergeProgram"] which can be used to ["Resolve"] those conflicts. |
A '''conflict''' occurs when two independent [[ChangeSet|changesets]] modify overlapping sections of a file in different ways. During a [[Merge|merge]], Mercurial may require the assistance of the user through a merge program which can be used to resolve those conflicts. |
| Line 6: | Line 6: |
| If the ["MergeProgram"] is not a graphical tool, | If the merge program is not a graphical tool, |
| Line 8: | Line 8: |
| the ["Conflict"] in the file using ''conflict markers''. A text editor can be used to ["Resolve"] the conflicts manually. |
the conflict in the file using ''conflict markers''. A text editor can be used to resolve the conflicts manually. |
| Line 45: | Line 45: |
| &lt;&lt;&lt;&lt;&lt;&lt;&lt; local | <<<<<<< local |
| Line 51: | Line 51: |
| &gt;&gt;&gt;&gt;&gt;&gt;&gt; other | >>>>>>> other |
| Line 55: | Line 55: |
| [http://floopityjoop.com/cat.html cat] [http://floopityjoop.com/cat.html cat] |
See also: TutorialConflict, ImergeExtension ---- CategoryGlossary |
Conflict
A conflict occurs when two independent changesets modify overlapping sections of a file in different ways. During a merge, Mercurial may require the assistance of the user through a merge program which can be used to resolve those conflicts.
If the merge program is not a graphical tool, a common fallback behavior is to use diff3 for highlighting the conflict in the file using conflict markers. A text editor can be used to resolve the conflicts manually.
For example:
Given the base file:
$ cat base A B C
assuming local is your modified copy of base:
$ cat local A B - my local changes C
and assuming other is another modified copy of base:
$ cat other A B - changes made by others C
then there's obviously a conflicting change on the B line. The "merged" content, as produced by the GNU diff3 program, will look like this:
$ diff3 -m local base other A <<<<<<< local B - my local changes ||||||| base B ======= B - changes made by others >>>>>>> other C
See also: TutorialConflict, ImergeExtension