07-28-2013, 09:00 PM
Here are the instructions:
Code:
If you have never pulled in core before, you need to set it up:
git remote add mcscore git@github.com:mc-server/Core.git
To pull in the latest version of core, first make sure you're on the master branch:
git checkout master
Then fetch the core remote:
git fetch mcscore
Then merge your master with the core remote, using the subtree strategy.
git merge --squash -s subtree --no-commit mcscore/master
Now all you need to do it commit your changes with an appropriate message and push it back to the repo.
git commit
git push
If you want the latest version in your feature branch, just check out into your feature branch and merge in master.