diff docs/troubles-handling.rst @ 5607:db1dd9fec06c

unstable-list: add an item about author divergence resolution

--- a/docs/troubles-handling.rst	Wed Oct 14 12:09:41 2020 +0200
+++ b/docs/troubles-handling.rst	Wed Oct 14 12:10:05 2020 +0200
@@ -411,3 +411,15 @@
 **Current Support Level**
 
 Good: current implementation is expected to perform the planned stabilisation.
+
+D-C3: Commit author conflict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Stabilisation Strategy**
+
+Merge authors using 3-way merge. If unable to merge we concatenate
+the two, separated by comma. (for e.g. "John Doe, Malcolm X")
+
+**Current Support Level**
+
+Good: current implementation is expected to perform the planned stabilisation.