[zibzab]

> the solution? who knows, one option would be to force push the earlier position of a branch, thus erasing the merge commit, but force pushes are considered a bad practice

This is definitely a better solution and the _only_ time force push is okay.

(Well unless this is a big public repo that have since moved on)