Skip to content

doc: update phrasing to use default branch rather than main in Syncing a Fork #842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hubwriter merged 5 commits into from
Nov 3, 2020
Merged

doc: update phrasing to use default branch rather than main in Syncing a Fork #842

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9050aa5
doc: update phrasing to use `default branch` rather than `main`
bnb Oct 27, 2020
9a271f0
doc: use active voice
bnb Oct 27, 2020
f24097b
Modify step 3 and fix typo
hubwriter Nov 2, 2020
96fd874
Merge branch 'main' into patch-2
hubwriter Nov 3, 2020
c64ff0c
Merge branch 'main' into patch-2
hubwriter Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Before you can sync your fork with an upstream repository, you must [configure a

{% data reusables.command_line.open_the_multi_os_terminal %}
2. Change the current working directory to your local project.
3. Fetch the branches and their respective commits from the upstream repository. Commits to `main` will be stored in a local branch, `upstream/main`.
3. Fetch the branches and their respective commits from the upstream repository. Commits to `BRANCHNAME` will be stored in the local branch `upstream/BRANCHNAME`.
```shell
$ git fetch upstream
> remote: Counting objects: 75, done.
Expand All @@ -23,12 +23,12 @@ Before you can sync your fork with an upstream repository, you must [configure a
> From https://{% data variables.command_line.codeblock %}/<em>ORIGINAL_OWNER</em>/<em>ORIGINAL_REPOSITORY</em>
> * [new branch] main -> upstream/main
```
4. Check out your fork's local `main` branch.
4. Check out your fork's local default branch - in this case, we use `main`.
```shell
$ git checkout main
> Switched to branch 'main'
```
5. Merge the changes from `upstream/main` into your local `main` branch. This brings your fork's `main` branch into sync with the upstream repository, without losing your local changes.
5. Merge the changes from the upstream default branch - in this case, `upstream/main` - into your local default branch. This brings your fork's default branch into sync with the upstream repository, without losing your local changes.
```shell
$ git merge upstream/main
> Updating a422352..5fdff0f
Expand Down