{"id":16546,"date":"2022-10-19T21:51:35","date_gmt":"2022-10-19T16:21:35","guid":{"rendered":"https:\/\/jassweb.com\/solved\/solved-how-to-make-git-honor-a-cancelled-merge-that-was-not-asked-for\/"},"modified":"2022-10-19T21:51:35","modified_gmt":"2022-10-19T16:21:35","slug":"solved-how-to-make-git-honor-a-cancelled-merge-that-was-not-asked-for","status":"publish","type":"post","link":"https:\/\/jassweb.com\/solved\/solved-how-to-make-git-honor-a-cancelled-merge-that-was-not-asked-for\/","title":{"rendered":"[Solved] How to make Git honor a cancelled merge that was not asked for?"},"content":{"rendered":"

[ad_1]
\n<\/p>\n

\n
\n
<\/div>\n
\n
\n

git push<\/code> should normally fail if there are any new commits on the remote, that you don’t have on your local branch yet.<\/p>\n

In order to push, you cannot be missing any commits that the server has.<\/p>\n

In the example you posted, you seem to have made the commits d091b80<\/code> and 217cb1f<\/code> on two different machines or two different local copies.<\/p>\n

When you were trying to push 217cb1f<\/code>, the server already had d091b80<\/code>, while you didn’t have it in your local branch.<\/p>\n

Before git can push to the server, you will need to pull that other commit from the server.<\/p>\n

Usually that is something, that you would do manually. For some reason it seems like your git push<\/code> is somehow invoking a git pull<\/code>.<\/p>\n

While I couldn’t find a specific option to enable this sort of behavior (and wouldn’t suggest doing so either), I can see that some people would want git to behave this way.
\nIf you are using another persons config files for git or for your shell, I would have a look if there is anything that might cause this weird behavior.<\/p>\n

So how does the merge commit generally come about? Set aside the weird behavior of the push command and assume you had manually done a pull:<\/p>\n

Git pull causes an unexpected merge commit<\/h2>\n

Git pull is doing two things:<\/p>\n