Changes between Version 13 and Version 14 of WorkingGuideLines

Timestamp:

11/02/09 10:23:20 (14 years ago)

Author:

andrew_b

Comment:

--

WorkingGuideLines

@@ -72 +72 @@
    * is the patch doing what it should?
    * the patch mustn't introduce new bugs!
- * If you're fine with this patch add your login to the "Votes for changeset" field, else if the patch is not okay, then remove votes and set the "Severity" field to "on rework" as keyword and describe whats problems with this patch.
+ * If you're fine with this patch, add your login to the "Votes for changeset" field, else if the patch is not okay, remove votes and set the "Severity" field to "on rework" as keyword and describe whats problems with this patch.
  * Currently two votes are needed in order to get a patch into the parent branch. If you are the second one which have successfully reviewed this patch then you also set the "Severity" field to "approved".
 
@@ -106 +106 @@
  $ git merge --log --no-ff 123_branch_name  // merge "123_branch_name" to "master"
 }}}
-   option --log add to commit list of merged patches, option --no-ff allow create merge commit in case where branch isn't child branch for current head, it should simplify understanding commit relation (use --no-ff option even you have one commit in branch). 
+   --log option adds the merged patches list to the commit. --no-ff option allows create the merge commit in case where branch isn't child branch for current head, it should simplify understanding commit relation (use --no-ff option even you have one commit in branch). 
 
  Now you ready to update master branch on server: