Skip to content

Commit de847a1

Browse files
authored
Merge pull request github#18618 from bishal7679/patch-7
Confusing example in Syncing a Fork is fixed
2 parents e22c94b + e1bfd5a commit de847a1

File tree

1 file changed

+2
-8
lines changed
  • content/pull-requests/collaborating-with-pull-requests/working-with-forks

1 file changed

+2
-8
lines changed

content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,8 @@ Before you can sync your fork with an upstream repository, you must [configure a
7777
> 2 files changed, 7 insertions(+), 9 deletions(-)
7878
> delete mode 100644 README
7979
> create mode 100644 README.md
80-
``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
81-
```shell
82-
$ git merge upstream/main
83-
> Updating 34e91da..16c56ad
84-
> Fast-forward
85-
> README.md | 5 +++--
86-
> 1 file changed, 3 insertions(+), 2 deletions(-)
87-
```
80+
```
81+
8882

8983
{% tip %}
9084

0 commit comments

Comments
 (0)