while rebasing after the resolve the conflict i had use
git rebase --continue
are the same file
I was having the same issue. What fixed it for me was setting my editor in my
git config --global core.editor "vim"