git error (Merging is not possible because you have unmerged files)

merge하다가 갑자기 오류생겼음

$ git merge --allow-unrelated-histories copy3/main
error: Merging 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.

알고보니 

이게 달라서였음

git commit -am '커밋 아무거나 메모'

이거 하니깐 뚝딱

 

 

안 되면

clone다시 했다..