diff text/learning_mercurial_in_workflows.txt @ 126:9655e0018355

Added a resolve part for merging.

--- a/text/learning_mercurial_in_workflows.txt	Wed Apr 29 08:39:14 2009 +0200
+++ b/text/learning_mercurial_in_workflows.txt	Fri May 01 13:51:27 2009 +0200
@@ -161,6 +161,21 @@
 
 If there are conflicts use "hg resolve" - that's also what merge tells you to do in case of conflicts. 
 
+First list the files with conflicts: 
+
+$ hg resolve --list
+
+Then resolve them one by one. "resolve" attempts the merge again: 
+
+$ hg resolve conflicting_file
+(fix it by hand, if necessary)
+
+Mark the fixed file as resolved: 
+
+$ hg resolve --mark conflicting_file
+
+Commit the merge, as soon as you resolved all conflicts. This step is also necessary if there were no conflicts! 
+
 $ hg commit -m "merged feature1"
 
 You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your work at home and at work.