Anonymous avatar Anonymous committed a856a9e

guide: added a note with a link to the conflict tutorial.

Comments (0)

Files changed (1)

+<div class="note">
+<p class="note-title">Note:</p>
+For more details on resolving conflicts, see the wiki-page <a title="Tutorial - Merging conflicting Changes href="">TutorialConflict</a>.
 <p>Mark the fixed file as resolved</p>
 <pre>$ hg resolve --mark conflicting_file
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.