changeset 5583:72a4aa791d97

unstable-list: some minor updates
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 10 Oct 2020 14:04:02 +0530
parents 041024be2163
children 7f9149ccbf42
files docs/troubles-handling.rst
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/docs/troubles-handling.rst	Fri Oct 09 08:39:15 2020 -0700
+++ b/docs/troubles-handling.rst	Sat Oct 10 14:04:02 2020 +0530
@@ -116,7 +116,7 @@
 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 @@
 
 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 @@
 
 
 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