Changes between Version 12 and Version 13 of WorkingGuideLines

Timestamp:

11/02/09 09:42:33 (14 years ago)

Author:

slavazanko

Comment:

--

WorkingGuideLines

@@ -102 +102 @@
  $ git pull                         // and check updates
 }}}
-  Merge process, if you has just one commit:
+  Merge process:
 {{{
- $ git merge --log 123_branch_name  // слияние с "master" той ветви, которую необходимо слить
+ $ git merge --log --no-ff 123_branch_name  // merge "123_branch_name" to "master"
 }}}
-
- If you have more than one commit:
-{{{
- $ git merge --log --no-ff 123_branch_name  // слияние с "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. 
+   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). 
 
  Now you ready to update master branch on server: 
@@ -122 +117 @@
  If you has any problems in merge process you should fix it manually and continue merge process, but try to check merge process before start to push or you can break branch.
 
- * Now you can close the ticket and the ticket will change into the testing state, and add to keywords name of branch you merge with (e.g. mater/commited-master). In ticket you must describe how get summary patch. For example:
+ * Now you can close the ticket and the ticket will change into the testing state, and rewrite 'Votes for changeset' to 'commited-master' text. Also, change value of 'Severity' fileld to 'merged'. In ticket comment you must describe how get summary patch. For example:
 {{{
 fixed: 111111111111111^...222222222222222 # for multipatch
@@ -128 +123 @@
 }}}
  where 111111111111111 - first commit; 222222222222222 - last commit
+Or you may describe just merge commit like:
+{{{
+Merge changeset:111111111111111
+}}}
+
  * After some time of testing a ticketadmin will close it finally.