docbrown/docs/getting-started/syncing.md
rhymes 9210f6793b Improvements on dev docs (#2616)
* Correct installation documentation

* Add stylized titles

* Add some changes to the getting started documentation

* Add changes for the backend guide

* Add changes for the design guide

* Add testing / Q&A guide improvements

* Minor fixes to contributing docs

* More improvements to the general doc

* Improvements for frontend guide
2019-04-29 18:54:29 -04:00

1.1 KiB

title
Keeping Your Fork In Sync

Keeping your fork in sync

Now that you have a fork of DEV's source code, there is work you will need to do to keep it updated.

Setup Your upstream

Inside your DEV directory, add a remote to the official DEV repo:

git remote add upstream https://github.com/thepracticaldev/dev.to.git

Rebasing from upstream

Do this prior to every time you create a branch for a PR:

Make sure you are on the master branch:

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

If your aren't on master, finish your work and checkout the master branch:

git checkout master

Do a pull with rebase against upstream

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.

Additional resources