Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/merge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ A---B main
\---C merge-fast-forward
```

With the ```git merge``` command, we are merging _into_ the current branch _from_ a branch we specify. So to perform the merge, run ```git merge fast-forward```.
With the ```git merge``` command, we are merging _into_ the current branch _from_ a branch we specify. So to perform the merge, run ```git merge merge-fast-forward```.

You should see something like this:

Expand Down