Changes between Version 37 and Version 38 of DevelopmentProcedure

Timestamp:

05/02/14 10:30:21 (11 years ago)

Author:

Jonathan

Comment:

—

DevelopmentProcedure

@@ -44 +44 @@
 git merge ticket_353
 }}}
+1.  If you haven't checked out a local copy of ticket_353 you can also do
+{{{
+git checkout development
+git merge remotes/origin/ticket_353
+}}}
 1. If there are conflicts you will have to resolve the conflicts, add the conflicted files and commit the merge.
 {{{
@@ -50 +55 @@
 git push
 }}}
-1. You can then delete the local branch
+1. You can then delete the local branch if you've checked out a local copy
 {{{
 git branch -d ticket_353