mirror of https://github.com/CrimsonTome/tldr.git
git-merge: --abort mentions that it's for situations with conflicts
parent
bade4c7c03
commit
9225a7b2d5
|
@ -14,6 +14,6 @@
|
||||||
|
|
||||||
`git merge --no-ff {{branch_name}}`
|
`git merge --no-ff {{branch_name}}`
|
||||||
|
|
||||||
- Abort merge:
|
- Abort a merge in case of conflicts:
|
||||||
|
|
||||||
`git merge --abort`
|
`git merge --abort`
|
||||||
|
|
Loading…
Reference in New Issue