Commit aac34b23 authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

unstable-list: add a "details of resolution" section for content-divergence

parent 7f9149ccbf42
......@@ -263,6 +263,19 @@ predecessor (which acts as the 3-way merge base), there are some situations we n
* divergent changeset can be orphan as well
* one side of divergence is in public phase
Details of resolution
Resolution of content-divergence can be understand by dividing it in stages:
The first stage of solving content-divergence is to find the changeset where the resolution
changeset will be based on (which we call the resolution parent or the target parent) and
relocate the divergent changesets on the resolution parent, if apply.
In second stage, we deal with merging files of two divergent changesets using the 3-way merge.
In third stage, we deal with merging the metadata changes and creating the resultant changeset.
Details of Sub cases
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