From 9103123c2222ef47662963a740038e0b87655ded Mon Sep 17 00:00:00 2001 From: Otto Date: Sat, 10 Oct 2020 16:03:35 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../syncing-a-fork.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md index eba43cbd5fd9..099c29b14468 100644 --- a/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md +++ b/translations/zh-CN/content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md @@ -37,7 +37,11 @@ versions: > 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 将执行“fast-forward”： + ```shell $ git merge upstream/master > Updating 34e91da..16c56ad