I ran into this issue today. The sequence of events was:
1) A git rebase, which resulted in a delete conflict. I had a few lines that I needed from the deleted file, so I opted to keep it. 2) Moving the lines elsewhere, then running 'git clean -dfx' which removed the file. 3) At this point 'git rebase --continue' complained about merge conflicts, yet 'git diff' and 'git status' did not report anything. 4) After 'touch <deleted-file>' and 'git rm <deleted-file>' I was able to complete the rebase.
Git reports version 1.7.0.4. -- Pertti -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
