Commit 7a54794a authored by Sushil Khanchi's avatar Sushil Khanchi 🐨
Browse files

unstable-list: some minor updates

parent 041024be2163
......@@ -116,7 +116,7 @@ O-A3: parent has multiple successors sets
O-A4: parent is split into multiple successors
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
O-A4.1: successors of parent are all one the same topological branch
O-A4.1: successors of parent are all on the same topological branch
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
......@@ -171,7 +171,7 @@ has a public predecessor.
Solving phase divergence is done by extracting the changes made between the
public predecessors and the latest evolution of the changesets into a new
changesets, descendants of the public prédecessors.
changesets, descendants of the public predecessors.
Cause of trouble
================
......@@ -235,7 +235,7 @@ Source of Complexity
Before we perform a 3-way merge between the divergent changesets and common
predecessor as base, there are some situations we need to take care of, like:
predecessor (which acts as the 3-way merge base), there are some situations we need to take care of, like:
* if divergent changesets moved, check which side moved in which direction,
and proceed accordingly
......
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