Committed my changes instead of git merge --continue

Question

I was trying to rebase my branch through git merge master . Upon running the command I discovered that I am having conflicts, so I resolved them and accidently committed the changes through VScode GUI (Instead of git merge --continue ). Upon returning to git bash (CLI), I ran git merge --continue and it throws an error saying There is no merge in progress. (MERGE_HEAD missing) .

What should I do?

Answer 1

A merge is a commit. Performing a merge with no conflict makes that commit. Continuing a merge after pausing because of a conflict also just makes that commit, Well, that's what you did, and you had fixed the conflict, so if that file is fine now, there is no more to do. The merge is over. Don't worry, be happy.