Skip to content

Instantly share code, notes, and snippets.

@worace

worace/pulling_updates.markdown

Created February 25, 2016 22:15
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save worace/b4974d604d6619c5dfb0 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save worace/b4974d604d6619c5dfb0 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
pulling_updates.markdown

Pulling Updated Changes from the Project Template

  1. Go to your project directory
  2. Checkout the master branch (git checkout master)
  3. Pull from the template master branch (git pull https://github.com/turingschool-examples/hyde.git master)
  4. 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.
  5. 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)
  6. 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.
  7. Push these new changes to your fork (git push origin master).
  8. Run the sanitation checker using rake sanitation:all
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment