changeset 5605:af1d71f3a028

unstable-list: add an item for solving named branch divergence

--- a/docs/troubles-handling.rst	Tue Oct 20 10:33:46 2020 +0200
+++ b/docs/troubles-handling.rst	Wed Oct 14 12:09:15 2020 +0200
@@ -381,3 +381,20 @@
 like branch name conflict, commit message conflict, commit author conflict.
 If everything goes fine, we create the resultant changeset as a resolution of
 content-divergence.
+
+D-C1: Branch name conflict
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Stabilisation Strategy**
+
+Merge branch names using the 3-way merge. If unable to merge,
+we prompt the user to select a branch.
+
+Possible improvement: If we are solving a long streak of divergence, each
+side having the same branch, we can probably infer the correct resolution
+from previous resolution.
+
+**Current Support Level**
+
+Good: current implementation is expected to perform the planned stabilisation.
+