From bbfdeaacccd9638f90736e7865d0fcafc8a8ef24 Mon Sep 17 00:00:00 2001 From: UnseenWizzard Date: Thu, 6 Jun 2019 22:56:43 +0200 Subject: [PATCH] Fix merge abort command being wrong - Thanks Fersu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db128cd..a371a51 100644 --- a/README.md +++ b/README.md @@ -401,7 +401,7 @@ We _stage_ them when we `add Bob.txt`, and then we `commit`. We already know the commit for the changes we've made to resolve the conflict. It's the _merge commit_ that is always present when merging. -Should you ever realize in the middle of resolving conflicts that you actually don't want to follow through with the `merge`, you can just `abort` it by running `git commit --abort`. +Should you ever realize in the middle of resolving conflicts that you actually don't want to follow through with the `merge`, you can just `abort` it by running `git merge --abort`. ## Rebasing