# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1600762750 -19800
# Node ID 1bc58c156c8926dca22b36ecbf6f32a87b6aabe3
# Parent  7f9149ccbf4241a7f8c170adaf33c2022f345309
unstable-list: add a "details of resolution" section for content-divergence

diff -r 7f9149ccbf42 -r 1bc58c156c89 docs/troubles-handling.rst
--- a/docs/troubles-handling.rst	Sat Oct 10 14:04:11 2020 +0530
+++ b/docs/troubles-handling.rst	Tue Sep 22 13:49:10 2020 +0530
@@ -263,6 +263,19 @@
 * divergent changeset can be orphan as well
 * one side of divergence is in public phase
 
+Details of resolution
+=====================
+
+Resolution of content-divergence can be understand by dividing it in stages:
+
+The first stage of solving content-divergence is to find the changeset where the resolution
+changeset will be based on (which we call the resolution parent or the target parent) and
+relocate the divergent changesets on the resolution parent, if apply.
+
+In second stage, we deal with merging files of two divergent changesets using the 3-way merge.
+
+In third stage, we deal with merging the metadata changes and creating the resultant changeset.
+
 Details of Sub cases
 ====================