-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
I just saw something like this, too.
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?
Cheers,
Uli
- --
"Do you know that books smell like nutmeg or some spice from a foreign land?"
-- Faber in Fahrenheit 451
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQEcBAEBCAAGBQJLA/qdAAoJECLkKOvLj8sGSCIIAL8SynjFbQamBAHjW7ypBscI
O+tCf2h8sFqNEntaqWbY2ZTMDh1VzWvgMUscGrZ9Q79+o3J8v/WqeLKGujT3WhBb
naiK4okCcRQFYOCkRV/RjQto8JTezPnzhLQ382C+qZOzTg3jUIlca8aHJ3KdOMiQ
iIbdi48WtZxP6f0Gb+kQo9f4ubYvLn2N9nEp/SZrzKxxSF8BSGVg/MfPcXUuWEZJ
R6jeEg7c7SZh9x4i//GgqdU0tQ7aDgv64/NgvQMLM9EzIclwmrmTUge/KXuDPJcz
Cd/jjTVbCv6Rc5Wn+eTQGR6ayFVNZ1pIg0Tt9ZY5CYElreMhJrjUEpSRG4zu3Ps=
=VvXJ
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
