- Go to your project directory
- Checkout the master branch (
git checkout master
) - Pull from the template master branch (
git pull https://github.com/turingschool-examples/hyde.git master
) - Resolve any CONFLICTs created by the merge. Remember to read the instructions from git carefully. It will tell you if you have any conflicts and in which files.
- If you get conflicts in the
Gemfile.lock
, it's easiest to resolve these by deleting the file (rm Gemfile.lock
) and re-running bundler (bundle
) - After resolving CONFLICTs, stage the files using (
git add
) and commit them (git commit
). You've now merged the updated changed from the original project template into your local repository. - Push these new changes to your fork (
git push origin master
). - Run the sanitation checker using
rake sanitation:all
Created
February 25, 2016 22:15
-
-
Save worace/b4974d604d6619c5dfb0 to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment