# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1602670181 -7200
# Node ID 4c2633a8d4d0522a2c954010b6ff4c69d5e0524b
# Parent  af1d71f3a028c1506ad5ca94176220f8a103eb5d
unstable-list: add an item about divergence on changeset description

diff -r af1d71f3a028 -r 4c2633a8d4d0 docs/troubles-handling.rst
--- a/docs/troubles-handling.rst	Wed Oct 14 12:09:15 2020 +0200
+++ b/docs/troubles-handling.rst	Wed Oct 14 12:09:41 2020 +0200
@@ -398,3 +398,16 @@
 
 Good: current implementation is expected to perform the planned stabilisation.
 
+D-C2: Commit description conflict
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Stabilisation Strategy**
+
+Merge commit description using text merge tool from user.
+
+Possible improvement: They are currently no way to "interrupt" and resume that
+conflict resolution. Having some way to do that would be nice.
+
+**Current Support Level**
+
+Good: current implementation is expected to perform the planned stabilisation.