Commit 058330ec authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

unstable-list: add "merging metadata" section for content-divergence

parent 5cbb1f356137
Pipeline #11561 passed with stage
in 4 minutes and 1 second
......@@ -373,3 +373,11 @@ D-B3: Multiple newest predecessor
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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment