GitHub.com Help Documentation

https://help.github.com/en/github

Working with forks

Configuring a remote for a fork

You must configure a remote that points to the upstream repository in Git to sync changes you make in a fork with the original repository. This also allows you to sync changes made in the original repository with the fork.

Open Terminal.
List the current configured remote repository for your fork.

$ git remote -v
> origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
> origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)

[x] 我的执行结果：

xuzhengfu at xuzhengfudeiMac in ~/Code/pilot-student on master [!?]
$ git remote -v
origin  https://github.com/Xuzhengfu/pilot-student.git (fetch)
origin  https://github.com/Xuzhengfu/pilot-student.git (push)

Specify a new remote upstream repository that will be synced with the fork.

$ git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git

[x] 我的执行结果：

xuzhengfu at xuzhengfudeiMac in ~/Code/pilot-student on master [!?]
$ git remote add upstream https://github.com/neolee/pilot-student.git

Verify the new upstream repository you've specified for your fork.

$ git remote -v
> origin    https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
> origin    https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)
> upstream  https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (fetch)
> upstream  https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push)

[x] 我的执行结果：

xuzhengfu at xuzhengfudeiMac in ~/Code/pilot-student on master [!?]
$ git remote -v
origin  https://github.com/Xuzhengfu/pilot-student.git (fetch)
origin  https://github.com/Xuzhengfu/pilot-student.git (push)
upstream    https://github.com/neolee/pilot-student.git (fetch)
upstream    https://github.com/neolee/pilot-student.git (push)

Logging

2020-05-07 10:13:28 initialize

Syncing a fork

Sync a fork of a repository to keep it up-to-date with the upstream repository.

Before you can sync your fork with an upstream repository, you must configure a remote that points to the upstream repository in Git.

Open Terminal.
Change the current working directory to your local project.
Fetch the branches and their respective commits from the upstream repository. Commits to master will be stored in a local branch, upstream/master.

$ git fetch upstream
> remote: Counting objects: 75, done.
> remote: Compressing objects: 100% (53/53), done.
> remote: Total 62 (delta 27), reused 44 (delta 9)
> Unpacking objects: 100% (62/62), done.
> From https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
>  * [new branch]      master     -> upstream/master

[x] 我执行的结果：

xuzhengfu at xuzhengfudeiMac in ~/Code/pilot-student on master [!?]
$ git fetch upstream
remote: Enumerating objects: 33, done.
remote: Counting objects: 100% (33/33), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 19 (delta 16), reused 18 (delta 15), pack-reused 0
Unpacking objects: 100% (19/19), 12.53 KiB | 261.00 KiB/s, done.
From https://github.com/neolee/pilot-student
 * [new branch]      master     -> upstream/master

Check out your fork's local master branch.

$ git checkout master
> Switched to branch 'master'

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.

$ git merge upstream/master
> Updating a422352..5fdff0f
> Fast-forward
>  README                    |    9 -------
>  README.md                 |    7 ++++++
>  2 files changed, 7 insertions(+), 9 deletions(-)
>  delete mode 100644 README
>  create mode 100644 README.md

If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":

$ git merge upstream/master
> Updating 34e91da..16c56ad
> Fast-forward
>  README.md                 |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Tip: Syncing your fork only updates your local copy of the repository. To update your fork on GitHub, you must push your changes.

[x] 我执行的结果：

xuzhengfu at xuzhengfudeiMac in ~/Code/pilot-student on master
$ git merge upstream/master
Auto-merging p2-d-functional-2.ipynb
Auto-merging p2-c-database.ipynb
CONFLICT (content): Merge conflict in p2-c-database.ipynb
Auto-merging p2-b-fsm.ipynb
Auto-merging p2-a-tree.ipynb
Auto-merging p2-8-list.ipynb
Auto-merging p2-7-iterable-iterator.ipynb
Auto-merging p2-6-string-data.ipynb
Auto-merging p2-5-functional-1.ipynb
Auto-merging p2-3-modules.ipynb
Auto-merging p2-1-function-def.ipynb
Auto-merging p1-b-final.ipynb
Auto-merging p1-5-structure-4.ipynb
Auto-merging p1-3-structure-2.ipynb
Automatic merge failed; fix conflicts and then commit the result.

xuzhengfu at xuzhengfudeiMac in ~/Code/pilot-student on master [+!]
$ code p2-c-database.ipynb

[ ] vscode 无法打开冲突文件。

Logging

2020-05-07 09:58:15 initialize

xuzhengfu / pilot