From 098036e8e6fe14a57ae743e1c2f25025b3c615bc Mon Sep 17 00:00:00 2001
From: Nick <nick_php@163.com>
Date: Wed, 1 Nov 2023 16:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E6=8C=81=20fork=20=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=92=8C=E6=BA=90=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/git.md b/git.md
index bba52b5..1d6905b 100644
--- a/git.md
+++ b/git.md
@@ -204,13 +204,15 @@ git remote remove origin #取消与远程仓库关联
 
 __保持 fork 之后的项目和源仓库同步__
 ```
-git remote add upstream [upstream_url] #添加上游仓库 upstream 任意
+git remote add upstream [upstream_url] #1、添加上游仓库命名为 upstream 
 
-git fetch upstream #拉取最新代码
+git fetch upstream #2、拉取最新代码
 
-git merge upstream/<branch_name> #将upstream/<branch_name> merge到本地当前分支
+git checkout master #3、切换分支
 
-git push origin <branch_name> #push到自己的github仓库
+git merge upstream/<branch_name> #4、将 upstream/<branch_name> merge 到本地当前分支
+
+git push origin <branch_name> #5、push 到自己的 github 仓库
 ```
 
 __暂存代码__