From 8691e3fc32fd47bfe8e2227a2f4890c411641af1 Mon Sep 17 00:00:00 2001 From: David Dyck Date: Wed, 7 Oct 2020 21:01:40 -0700 Subject: [PATCH 1/2] update master to main new work processes use 'main' instead of 'master' --- .../syncing-a-fork.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index 458bfa66d631..83cf92ca05bb 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -20,16 +20,16 @@ Before you can sync your fork with an upstream repository, you must [configure a > remote: Total 62 (delta 27), reused 44 (delta 9) > Unpacking objects: 100% (62/62), done. > From https://{% data variables.command_line.codeblock %}/ORIGINAL_OWNER/ORIGINAL_REPOSITORY - > * [new branch] master -> upstream/master + > * [new branch] main -> upstream/main ``` -4. Check out your fork's local `master` branch. +4. Check out your fork's local `main` branch. ```shell - $ git checkout master - > Switched to branch 'master' + $ git checkout main + > Switched to branch 'https://github.com/todbot/qtpy-tricks.git' ``` -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. +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. ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating a422352..5fdff0f > Fast-forward > README | 9 ------- @@ -39,7 +39,7 @@ Before you can sync your fork with an upstream repository, you must [configure a > create mode 100644 README.md ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": ```shell - $ git merge upstream/master + $ git merge upstream/main > Updating 34e91da..16c56ad > Fast-forward > README.md | 5 +++-- From b8ae9903aa54a36048c163bbba0b3df1d151ff56 Mon Sep 17 00:00:00 2001 From: Janice Date: Fri, 23 Oct 2020 16:12:06 -0700 Subject: [PATCH 2/2] Update content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md Co-authored-by: Alex Mullans --- .../syncing-a-fork.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index 83cf92ca05bb..a3d3ac7f76be 100644 --- a/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -25,7 +25,7 @@ Before you can sync your fork with an upstream repository, you must [configure a 4. Check out your fork's local `main` branch. ```shell $ git checkout main - > Switched to branch 'https://github.com/todbot/qtpy-tricks.git' + > 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. ```shell