Whenever I commit my changes locally and then push my repo remotely, Git requires me to do a merge. After completing accepting the changes in VSCode, it won't allow me to proceed. I can't commit because it says there's nothing to commit. I can't stage because there's nothing to stage. The only way out is by resetting back to a previous state. I can't abort the merge either, there's only an option for git abort rebase which says there's no rebase in progress.
Here's what git status says:
On branch main Your branch and 'origin/main' have diverged, and have 1 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. (use "git commit" to conclude merge)