Snehal Dangroshiya Snehal Dangroshiya - 2 months ago 21
Git Question

I am trying to interactive git rebase but it shows me mv: '<path>/git-rebase-todo.new' and '<path>/git-rebase-todo' are the same file

while rebasing after the resolve the conflict i had use

git rebase --continue
and after that below message printed lots of time on my terminal and still rebasing not get completed.

mv: <path>/.git/rebase-merge/git-rebase-todo.new
and
<path>/wa-git/.git/rebase-merge/git-rebase-todo'
are the same file


have anyone idea to solve this problem. it would be very helpful to me.

thanks in advance

Ben Ben
Answer

I was having the same issue. What fixed it for me was setting my editor in my .gitconfig file.

git config --global core.editor "vim"
Comments