# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1602670103 -7200
# Node ID cbc886623dc1247e5befdd8bb36524ad92f7d831
# Parent  5cbb1f356137882dca78a3fa155f07b8ea426448
unstable-list: add "merging metadata" section for content-divergence

diff -r 5cbb1f356137 -r cbc886623dc1 docs/troubles-handling.rst
--- a/docs/troubles-handling.rst	Sat Oct 10 22:44:24 2020 +0530
+++ b/docs/troubles-handling.rst	Wed Oct 14 12:08:23 2020 +0200
@@ -373,3 +373,11 @@
 
 XXX: yet to explore
 
+
+D-C: Merging metadata changes and create resultant changeset
+------------------------------------------------------------
+
+While merging the metadata, there are few sub-cases that could arise
+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.