--- a/docs/evolve-good-practice.rst Thu Jan 24 18:02:00 2013 -0500
+++ b/docs/evolve-good-practice.rst Thu Jan 24 18:05:59 2013 -0500
@@ -2,7 +2,7 @@
.. Logilab SA <contact@logilab.fr>
-----------------------------------------
-Good pratice for (early) user of evolve
+Good practice for (early) users of evolve
-----------------------------------------
Avoid unstability
@@ -16,12 +16,12 @@
Branch as much as possible
--------------------------------
-This is not MQ, you are not constrainted to linear history.
+This is not MQ; you are not constrained to linear history.
Making a branch per independent branch will help you avoid unstability
and conflict.
-Rewrite you change only
+Rewrite your changes only
------------------------------------------------
There is no descent conflict detection and handling right now.
@@ -29,10 +29,10 @@
conflicts. Communicate with your fellow developers before trying to
touch other people's work (which is a good pratice in any case).
-Using multiple branch will help you to achieve this goal.
+Using multiple branches will help you to achieve this goal.
-Prefer pushing unstability than touching other people changeset
-------------------------------------------------------------------
+Prefer pushing unstability to touching other people changesets
+--------------------------------------------------------------
If you have children changesets from other people that you don't really care