From 0316f0f4f2b26ea3e5622d44689e87ce67d411b6 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sat, 29 Oct 2022 07:56:14 -0700 Subject: [PATCH] Document git merge --abort --- doc/release-process.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-process.md b/doc/release-process.md index 3eff53e..20055c3 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -21,3 +21,5 @@ git merge --no-ff -X theirs master The last command uses the "theirs" merge strategy option to the "recursive" merge strategy, which is default. See "git help merge" for more details. +If you have a messed up merge or you don't want to deal with conflicts right now, you can do `git merge --abort` to cancel a merge. +