Mercurial > evolve

diff docs/troubles-handling.rst @ 5497:e7b70fe1297a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: add source-of-complexity for phase-divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 18 Aug 2020 08:47:15 +0530
parents 87aad54c0f1f
children f5d44464d72e
line wrap: on
line diff
--- a/docs/troubles-handling.rst	Wed Aug 26 11:55:19 2020 +0200
+++ b/docs/troubles-handling.rst	Tue Aug 18 08:47:15 2020 +0530
@@ -188,6 +188,11 @@
 Source of Complexity
 ********************
 
+* public version is a merge
+* phase-divergent (bumped) changeset is a merge
+* changeset was split (linear, over multiple topo branches)
+* rebasing might lead to conflict.
+
 Details of Sub cases
 ********************