【Git】How to fix: fatal: Exiting because of an unresolved conflict on GitHub
Abstract I tried to push my repository to Git, but because of the error: fatal: Exiting because of an unresolved conflict, it failed. So, I wrote down the solution how to fix this error on this article. I'm not English native speaker, so I'm sorry if English grammar is weird. ;) Index Abstract Index Environment What I tried Solution Conclusion Environment ・mac OS Catarina 10.15.1(2017) ・Rails 6 ・heroku What I tried I tried to pull git local repository to master branch on GitHub. master-branch $ git pull origin master But the error below happens: error: Pulling 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. I'm not used to use git, so I tried merge or revert git branch. But it doesn't work well. By the ...