Mercurial > evolve

changeset 5585:1bc58c156c89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: add a "details of resolution" section for content-divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 22 Sep 2020 13:49:10 +0530
parents 7f9149ccbf42
children f701c75e53f6
files docs/troubles-handling.rst
diffstat 1 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
 ====================