You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
+7-7Lines changed: 7 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -20,16 +20,16 @@ Before you can sync your fork with an upstream repository, you must [configure a
20
20
> remote: Total 62 (delta 27), reused 44 (delta 9)
21
21
> Unpacking objects: 100% (62/62), done.
22
22
> 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
24
24
```
25
-
4. Check out your fork's local `master` branch.
25
+
4. Check out your fork's local `main` branch.
26
26
```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'
29
29
```
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.
31
31
```shell
32
-
$ git merge upstream/master
32
+
$ git merge upstream/main
33
33
> Updating a422352..5fdff0f
34
34
> Fast-forward
35
35
> README | 9 -------
@@ -39,7 +39,7 @@ Before you can sync your fork with an upstream repository, you must [configure a
39
39
> create mode 100644 README.md
40
40
``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
0 commit comments