# HG changeset patch # User Sushil khanchi # Date 1597720635 -19800 # Node ID e7b70fe1297afddea8fdfdeecba106749c8ef1aa # Parent 87aad54c0f1f07529a041a6715763e98299d9cb0 unstable-list: add source-of-complexity for phase-divergence diff -r 87aad54c0f1f -r e7b70fe1297a docs/troubles-handling.rst --- 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 ********************