--- a/doc/evolve-tutorial.rst	Tue Mar 20 16:23:02 2012 +0100
+++ b/doc/evolve-tutorial.rst	Tue Mar 20 16:58:00 2012 +0100
@@ -122,7 +122,10 @@
 create *unstable* changeset and *suspended obsolete* changeset
 
 .. warning:: ``hg stabilize`` have no --continue to use after conflict
-             resolution
+             resolution. is conflict occurs use::
+
+               $ hg up -C . # cancel the failed merge
+               $ hg stabilize -n # go get a command to execute
 
 .. warning:: stabilization does not handle deletion yet.
 
@@ -168,6 +171,11 @@
 
     $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/
 
+Prevent my unfinished changeset to get published
+------------------------------------------------------------
+
+The easiest way is to set them in the private phase
+
 Important Note
 =====================================================================