Page Title

Body
To merge in changes Rails Machine has made to your code at GitHub, please follow these instructions * First, commit or stash any changes in your index. The following steps need to be performed in a clean working directory. <pre> <code> git status # On branch master nothing to commit (working directory clean) </code> </pre> * Next, you'll add a remote for Rails Machine's fork of your repository and fetch the latest changes <pre> <code> git remote add railsmachine git@github.com:railsmachine/your_repo.git git fetch railsmachine </code> </pre> * Now, merge railsmachine's changes back into master (or whichever branch you prefer to deploy from) and push. <pre> <code> git checkout master # switch to the 'master' branch git diff ..railsmachine/master # peview the changes git merge railsmachine/master # perform the merge git status # ensure there are no conflicts rake # run your test suite git push origin master # push to your origin </code> </pre> * If you wanted to merge these changes into another branch called "production", you'd perform the following steps: <pre> <code> git checkout production # switch to the 'production' branch git diff ..railsmachine/master # peview the changes git merge railsmachine/master # perform the merge git status # ensure there are no conflicts rake # run your test suite git push origin production # push to your origin </code> </pre> h2. Conflicts Please refer to the "git-merge documentation":http://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_how_conflicts_are_presented for a great guide to git conflict resolution.

Make page private