Github进行fork后如何与原仓库同步

merge前的设定

1. 进入到本地仓库的目录。

下面所有操作，如无特别说明，都是在你的本地仓库的目录下操作。比如我的本地仓库为/Users/lijinwen/study-p/doc/vue3-composition-admin

lddeMacBook-Pro:~ lijinwen$ cd /Users/lijinwen/study-p/doc/vue3-composition-admin
lddeMacBook-Pro:vue3-composition-admin lijinwen$

2. 执行命令 git remote -v 查看你的远程仓库的路径：

lddeMacBook-Pro:vue3-composition-admin lijinwen$ git remote -v
origin	https://github.com/ysg-lijinwen/vue3-composition-admin.git (fetch)
origin	https://github.com/ysg-lijinwen/vue3-composition-admin.git (push)

如果只有上面2行，说明你未设置 upstream （中文叫：上游代码库）。一般情况下，设置好一次 upstream 后就无需重复设置。

3. 执行命令 git remote add upstream https://github.com/RainManGO/vue3-composition-admin.git 把vue3-composition-admin仓库设置为你的 upstream 。这个命令执行后，没有任何返回信息；所以再次执行命令 git remote -v 检查是否成功。

lddeMacBook-Pro:vue3-composition-admin lijinwen$ git remote add upstream https://github.com/RainManGO/vue3-composition-admin.git
lddeMacBook-Pro:vue3-composition-admin lijinwen$ git remote -v
origin	https://github.com/ysg-lijinwen/vue3-composition-admin.git (fetch)
origin	https://github.com/ysg-lijinwen/vue3-composition-admin.git (push)
upstream	https://github.com/RainManGO/vue3-composition-admin.git (fetch)
upstream	https://github.com/RainManGO/vue3-composition-admin.git (push)

4. 执行命令 git status 检查本地是否有未提交的修改。如果有，则把你本地的有效修改，先从本地仓库推送到你的github仓库。最后再执行一次 git status 检查本地已无未提交的修改。

git add -A` 或者 `git add filename`
`git commit -m "your note"`
`git push origin main`
`git status

注1：由于fetch之后，可能会出现冲突，如果本地的修改没什么价值，建议先放弃本地的修改，然后再进行fetch。

merge 的关键命令

以下操作紧接着上面的步骤。

5. 执行命令 git fetch upstream 抓取原仓库的更新：

lddeMacBook-Pro:vue3-composition-admin lijinwen$ git fetch upstream
fatal: unable to access 'https://github.com/RainManGO/vue3-composition-admin.git/': LibreSSL SSL_connect: SSL_ERROR_SYSCALL in connection to github.com:443 
lddeMacBook-Pro:vue3-composition-admin lijinwen$ git fetch upstream
remote: Enumerating objects: 115, done.
remote: Counting objects: 100% (115/115), done.
remote: Compressing objects: 100% (74/74), done.
remote: Total 115 (delta 60), reused 62 (delta 35), pack-reused 0
Receiving objects: 100% (115/115), 6.04 MiB | 65.00 KiB/s, done.
Resolving deltas: 100% (60/60), completed with 20 local objects.
From https://github.com/RainManGO/vue3-composition-admin
 * [new branch]      feature/build-optimize -> upstream/feature/build-optimize
 * [new branch]      fix/https              -> upstream/fix/https
 * [new branch]      gh-pages               -> upstream/gh-pages
 * [new branch]      main                   -> upstream/main
 * [new branch]      minimal                -> upstream/minimal

6. 执行命令 git checkout main 切换到 main 分支：

lddeMacBook-Pro:vue3-composition-admin lijinwen$ git checkout main
Already on 'main'
Your branch is up to date with 'origin/main'.

7. 执行命令 git merge upstream/main 合并远程的main分支：

lddeMacBook-Pro:vue3-composition-admin lijinwen$ git merge upstream/main
Auto-merging src/layout/components/tags_view/Index.vue
Merge made by the 'recursive' strategy.
 IMAGE/QQ.JPG                                       | Bin 0 -> 168677 bytes
 README.md                                          |  23 ++++++++++++++----
 package.json                                       |   4 +--
 src/assets/images/login/night.mp4                  | Bin 12194188 -> 6205341 bytes
 src/components/material-input/Index.vue            |  27 +++++++++++----------
 src/components/right_panel/Index.vue               |   6 ++---
 src/layout/components/tags_view/Index.vue          |  11 ++++++---
 src/plugins/element.ts                             |   3 ++-
 src/store/modules/user/actions.ts                  |   4 +--
 .../dashboard/admin/components/UpdateTimeline.vue  |   1 +
 src/views/example/components/ArticleDetail.vue     |  12 ++++++---
 src/views/excel/ExportExcel.vue                    |  15 +++++++++---
 src/views/excel/components/BookTypeOption.vue      |  14 ++++++++---
 13 files changed, 78 insertions(+), 42 deletions(-)
 create mode 100644 IMAGE/QQ.JPG

8. 执行命令 git push把本地仓库向github仓库（你fork到自己名下的仓库）推送修改

如果担心自己不小心改了哪里，可以再次执行命令 git status 检查哪些文件有变化。这个操作仅是检查，不会改变任何状态，放心用。

lddeMacBook-Pro:vue3-composition-admin lijinwen$ git push
Username for 'https://github.com.cnpmjs.org': ysg-lijinwen     
Password for 'https://ysg-lijinwen@github.com.cnpmjs.org': 
warning: redirecting to https://github.com.cnpmjs.org/ysg-lijinwen/vue3-composition-admin.git/
Enumerating objects: 19, done.
Counting objects: 100% (19/19), done.
Delta compression using up to 4 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 803 bytes | 267.00 KiB/s, done.
Total 7 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
To https://g.0x6.xyz/https://github.com/ysg-lijinwen/vue3-composition-admin.git
   1a02701..ca686a6  main -> main