git -c user.useConfigOnly=true commit --quiet --allow-empty-message --file -
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

The only thing I have done differently is I have two laptops in different locations. I did my notes on a markdown file on laptop A and forgot to push it to Git. When I got to laptop B I decided to make a new markdown file (to continue my assignment). I saved it and pushed it to my repository. Now that I'm back at Laptop A I got this error.

On the bottom left of Visual Studio I have a notification that says: Note(Git)- Pull 2 and push 1 commits between origin/main