When we merge, if there are conflicts and we don't want to finish it, the best way is to abort the operation
git merge --abort
by Valeri Tandilashvili
4 years ago
Git
1
Pro tip: use ```triple backticks around text``` to write in code fences