Document git merge --abort

2 years ago · 0316f0f4f2
1 changed files with 2 additions and 0 deletions
--- 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.
`@ -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.`	`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.