[Solved] How to make Git honor a cancelled merge that was not asked for?
git push should normally fail if there are any new commits on the remote, that you don’t have on your local branch yet. In order to push, you cannot be missing any commits that the server has. In the example you posted, you seem to have made the commits d091b80 and 217cb1f on two different … Read more