I originally have main and branch A. Then I merged them. Then I modified something locally but saw 5k changes after I did "git add .". Then the origin remote disappeared (nothing returned after I did "git remote -v"). So I added a new remote origin with the same git remote url as deleted git("git add remote [git url]). But I only saw "master" branch. I did not name such a branch name. So I did "git pull --all". I then saw all branches pulled locally (main, branch A and master branch). Then the merge trouble began after I tried to merge master branch to main( "git merge origin master"). The error is as below. I checked every file and there's nothing I need to resolve. This whole thing caused failure of my Heroku deployment. I'm very anxious to get this fixed. Any hints and advice would be so appreciated!
error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.
