9210f6793b
* 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
53 lines
1.1 KiB
Markdown
53 lines
1.1 KiB
Markdown
---
|
|
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:
|
|
|
|
```shell
|
|
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:
|
|
|
|
```shell
|
|
$ 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:
|
|
|
|
```shell
|
|
git checkout master
|
|
```
|
|
|
|
Do a pull with rebase against `upstream`
|
|
|
|
```shell
|
|
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
|
|
|
|
```shell
|
|
git push origin master --force
|
|
```
|
|
|
|
This will overwrite the `master` branch of your fork.
|
|
|
|
## Additional resources
|
|
|
|
- [Syncing a fork](https://help.github.com/articles/syncing-a-fork/)
|