This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit 001851ef authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

unstable-list: add an item for solving named branch divergence

parent f27ef537bf83
......@@ -381,3 +381,20 @@ 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.
D-C1: Branch name conflict
^^^^^^^^^^^^^^^^^^^^^^^^^^
**Stabilisation Strategy**
Merge branch names using the 3-way merge. If unable to merge,
we prompt the user to select a branch.
Possible improvement: If we are solving a long streak of divergence, each
side having the same branch, we can probably infer the correct resolution
from previous resolution.
**Current Support Level**
Good: current implementation is expected to perform the planned stabilisation.
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