diff docs/troubles-handling.rst @ 5587:c2e71fc0efeb

unstable-list: add "merging files" section for content-divergence

--- a/docs/troubles-handling.rst	Tue Sep 22 13:50:06 2020 +0530
+++ b/docs/troubles-handling.rst	Tue Sep 22 13:50:45 2020 +0530
@@ -337,3 +337,27 @@
 
 XXX: yet to decide resolution
 
+
+D-B: Merging files of divergent changesets
+------------------------------------------
+
+While merging the files, there are few sub-cases that could arise
+like file content conflict, rename information conflict, multiple newest
+predecessor. Let's see them in detail.
+
+D-B1: File content conflict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If there is a conflict in merging content of files we let the user to
+resolve the conflict.
+
+D-B2: Rename information conflict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+XXX: yet to explore
+
+D-B3: Multiple newest predecessor
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+XXX: yet to explore
+