Skip to content

Instantly share code, notes, and snippets.

@jagregory

jagregory/gist:302092

Forked from DarthFubuMVC/gist:302084
Created February 11, 2010 23:09
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jagregory/302092 to your computer and use it in GitHub Desktop.
Save jagregory/302092 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Jeremy, this is for your benefit. I wanted to follow Josh's advice with that patch that Peter just sent in.
Here was my workflow:
- git pull (make sure I'm up to date)
- git apply patch.txt
- del patch.txt
- rake
- git commit -a -m "blah blah"
- git pull
- git push (fin)
Raw
gistfile2.txt
In SVN:
- svn update
- copy the patch
- svn apply.. (or something, I forget the syntax)
- del patch
- rake
- (smoke test)
- svn update (do merge)
- svn commit...
Done.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment