Commit 372f2c2f authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

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

parent f701c75e53f6
......@@ -337,3 +337,27 @@ D-A3.6: both moved on two different unrelated branch
XXX: yet to decide resolution
D-B: Merging files of divergent changesets
------------------------------------------
While merging the files, there are few sub-cases that could arise
like file content conflict, rename information conflict, multiple newest
predecessor. Let's see them in detail.
D-B1: File content conflict
^^^^^^^^^^^^^^^^^^^^^^^^^^^
If there is a conflict in merging content of files we let the user to
resolve the conflict.
D-B2: Rename information conflict
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
XXX: yet to explore
D-B3: Multiple newest predecessor
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
XXX: yet to explore
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