Level 65
Do git status and check what's changed.You probably edited files in the git or file permissions have changed maybe.
2 likes
Jun 18, 2016
4
Level 1
error: Pull is not possible because you have unmerged files.
I'm having trouble with deploying files. When I go to Forge and Deploy Now getting this error:
error: Pull 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.
My repository is on Bitbucket. Tried everything I could find, have no idea how to solve this. Anybody can help me with this?
Level 1
So, I made huge mistake of going on server and edit files there. And then, all was messed up. Have no idea after how much hours, finally worked it out. Edited files as was before, and did git reset --hard. Now everything is okay. Well, stupidity and lack of knowledge led me to this problem. But as always, definitely learned a lot making that mistake :)
Level 65
Yup, that's it :P
It's fine for untracked files on remote, like if you use .env file for environment vars. Just have to think where you're editing stuff!
if you've solved it, mark the thread as solved by marking one of the replies as the best answer (icon).
Level 2
I have the same issue but i have not amended anything on the server e.g (digital ocean) and i have no conflicts on my local machine. Any ideas?
Please or to participate in this conversation.