Skip to content
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

Jump to bottom

update master to main #233

Merged
merged 3 commits into from
Oct 23, 2020
Merged

update master to main #233

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8691e3f
update master to main
d-c-d Oct 8, 2020
b8ae990
Update content/github/collaborating-with-issues-and-pull-requests/syn…
janiceilene Oct 23, 2020
9e085c1
Merge branch 'main' into patch-1
janiceilene Oct 23, 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
14 changes: 7 additions & 7 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 @@ -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 %}/<em>ORIGINAL_OWNER</em>/<em>ORIGINAL_REPOSITORY</em>
> * [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'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switched to branch 'main'

janiceilene marked this conversation as resolved.
Show resolved Hide resolved
```
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 -------
Expand All @@ -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 +++--
Expand Down