From f7b5300f401428321cff5030c09c644fd78b7385 Mon Sep 17 00:00:00 2001 From: Bishal Das <70086051+bishal7679@users.noreply.github.com> Date: Tue, 14 Jun 2022 19:11:36 +0530 Subject: [PATCH] Confusing example in Syncing a Fork is fixed --- .../working-with-forks/syncing-a-fork.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md index f1fecbd82ad3..002ab0a8a0f3 100644 --- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md +++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md @@ -77,14 +77,8 @@ Before you can sync your fork with an upstream repository, you must [configure a > 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": - ```shell - $ git merge upstream/main - > Updating 34e91da..16c56ad - > Fast-forward - > README.md | 5 +++-- - > 1 file changed, 3 insertions(+), 2 deletions(-) - ``` + ``` + {% tip %}