Changes between Version 42 and Version 43 of DevelopmentProcedure

Timestamp:

06/05/14 15:23:32 (11 years ago)

Author:

Jonathan

Comment:

—

DevelopmentProcedure

@@ -59 +59 @@
 git commit -m 'merged ticket_353 into development'
 git push
+}}}
+1.  If something goes wrong with the merge, you can always abort by using
+{{{
+git reset --hard HEAD
 }}}
 1. You can then delete the local branch if you've checked out a local copy