Jak cofnąć popchnięte scalanie
$ git revert -m 1 <merge-commit-hash>
Outrageous Ostrich
$ git revert -m 1 <merge-commit-hash>