Skip to content

Commit 8691e3f

Browse files
authored
update master to main
new work processes use 'main' instead of 'master'
1 parent 1d45799 commit 8691e3f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ Before you can sync your fork with an upstream repository, you must [configure a
2020
> remote: Total 62 (delta 27), reused 44 (delta 9)
2121
> Unpacking objects: 100% (62/62), done.
2222
> From https://{% data variables.command_line.codeblock %}/<em>ORIGINAL_OWNER</em>/<em>ORIGINAL_REPOSITORY</em>
23-
> * [new branch] master -> upstream/master
23+
> * [new branch] main -> upstream/main
2424
```
25-
4. Check out your fork's local `master` branch.
25+
4. Check out your fork's local `main` branch.
2626
```shell
27-
$ git checkout master
28-
> Switched to branch 'master'
27+
$ git checkout main
28+
> Switched to branch 'https://github.com/todbot/qtpy-tricks.git'
2929
```
30-
5. Merge the changes from `upstream/master` into your local `master` branch. This brings your fork's `master` branch into sync with the upstream repository, without losing your local changes.
30+
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.
3131
```shell
32-
$ git merge upstream/master
32+
$ git merge upstream/main
3333
> Updating a422352..5fdff0f
3434
> Fast-forward
3535
> README | 9 -------
@@ -39,7 +39,7 @@ Before you can sync your fork with an upstream repository, you must [configure a
3939
> create mode 100644 README.md
4040
``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
4141
```shell
42-
$ git merge upstream/master
42+
$ git merge upstream/main
4343
> Updating 34e91da..16c56ad
4444
> Fast-forward
4545
> README.md | 5 +++--

0 commit comments

Comments
 (0)