Git create a blank merge commit keeping all current changes and exit merge-CodePudding

I want to merge master/main branch into my feature branch.

There are conflicts.

I resolved all the conflicts by keep current changes and there are no changes to commit.

But I am still stuck in MERGING mode as I have no changes to commit in the merge commit

How do I create a blank merge commit or exit the MERGING mode without any commit but marking the master branch as merged?

CodePudding user response：

I was using vscode to create a blank commit and it did not allow me to create a blank commit.

I ran git commit -m "message" and it created the blank merge commit

CodePudding user response：

I am still stuck in MERGING mode

You must finalize the merge after the conflicts have been resolved.

git add --all
git merge --continue