# HG changeset patch # User Sushil khanchi # Date 1602670205 -7200 # Node ID db1dd9fec06cea0962fd3f03b21b865fc594bf92 # Parent 4c2633a8d4d0522a2c954010b6ff4c69d5e0524b unstable-list: add an item about author divergence resolution diff -r 4c2633a8d4d0 -r db1dd9fec06c docs/troubles-handling.rst --- 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.