comparison docs/troubles-handling.rst @ 5585:1bc58c156c89

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

5584:7f9149ccbf42

  and proceed accordingly
* they moved on different unrelated branches
* divergent changeset can be orphan as well
* one side of divergence is in public phase

Details of Sub cases
====================

.. contents::
   :local:

5585:1bc58c156c89

  and proceed accordingly
* they moved on different unrelated branches
* 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
====================

.. contents::
   :local: