Skip to content

Instantly share code, notes, and snippets.

@kennyj
Created June 11, 2012 14:59
Show Gist options
  • Save kennyj/2910490 to your computer and use it in GitHub Desktop.
Save kennyj/2910490 to your computer and use it in GitHub Desktop.
how to merge
あまりgitの扱いに長けていませんが、概ねこんな感じでいけそうな気がします。
$ git checkout fix-templates-copy
$ git remote add kennyj git://github.com/kennyj/rails.git
$ git fetch kennyj
$ git show 1681b2c54ca240af545d884e291029e77b70fb94 # 確認
$ git cherry-pick 1681b2c54ca240af545d884e291029e77b70fb94
$ cd railties
(この辺でブランチ元masterをpullしてrebaseした方が良いかもです)
$ bundle exec ruby -Ilib:test test/application/rake_test.rb --name=test_copy_templates # 本来は@suginoyさんの修正が無い状況で落ちるのを確認した方が良いですけどね。。
$ git push -f [email protected]:suginoy/rails.git fix-templates-copy
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment