retitle 542709 git-core: unexpectedly dirty index after rebase thanks Ximin Luo wrote:
> if you only git-add, then when you try to git-rebase --continue, it will say: > > You must edit all merge conflicts and then > mark them as resolved using git add > > it will only proceed with the continue after you do "git diff", for some > reason. The only thing "git diff" does that would be relevant is to call update-index -q --refresh. See git-update-index(1). If some high-level command is leaving the index dirty, that is a bug. Uli Schlachter wrote: > After git rebase I got tons of conflicts, I fixed them up and "git add"'ed > each > file, but git rebase --continue just showed me the message the message above. > (git status didn't report any unmerged files) > > With some googling I found git diff-files which gave me a file name. > After also merging this file and "git add"'ing it, git rebase --continue > worked. > > @Ximin Luo: Is it possible that you just missed a file, too, because 'git > status' didn't list it? ‘git status’ is supposed to report unmerged paths. If it does not, that is a bug. Next time, please make a backup of your repository with ‘cp -a’ before recovering from this sort of bug, so we can figure out what went wrong. ;-) Thanks for the reports. Kind regards, Jonathan -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
