Now that you have a fork of Forem's source code, there is work you will need to do to keep it updated.
Inside your Forem directory, add a remote to the official Forem repo:
git remote add upstream https://github.com/forem/forem.git
Do this prior to creating each branch for a PR:
Make sure you are on the master branch:
1 2 3
$ git status On branch master Your branch is up-to-date with 'origin/master'.
If you aren't on
master, finish your work and checkout the
git checkout master
Do a pull with rebase against
git pull --rebase upstream master
This will pull down all of the changes to the official
master branch, without making an additional commit in your local repo.
(Optional) Force push your updated
master branch to your GitHub fork
git push origin master --force
This will overwrite the
master branch of your fork.
Sometimes, your forked branch may get out of date. To get it up to date it, carry out the following steps:
Rebase from upstream once again:
git checkout master git pull --rebase upstream master
Checkout your feature branch locally and merge master back into your branch:
git checkout <feature-branch-name> git merge master
Merge any conflicts in editor if necessary:
git commit -m "Fix merge conflicts"
Push the changes back to your origin feature branch:
git push origin <feature-branch-name>
After you've fetched new commits from upstream, run
./bin/setup, and it will install new gems, npm packages, update database, and restart Rails server.