Hi Pertti, Pertti Kellomäki wrote:
> I ran into this issue today. The sequence of events was: Excellent! I wonder: . What filesystem are you using? . What kernel (uname -a)? . Did you catch what 'git diff-files' and 'git ls-files -u' said at the time? . Can you reproduce it? > 3) At this point 'git rebase --continue' complained about merge > conflicts, yet 'git diff' and 'git status' did not report anything. Do you remember what message it printed? One can find some possibilities in the "$(git --exec-path)/git-rebase" script. > 4) After 'touch <deleted-file>' and 'git rm <deleted-file>' I was > able to complete the rebase. > > Git reports version 1.7.0.4. Thank you very much for this. Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
