-
-
Save jagregory/302092 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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