From: Phillip Susi <psusi@ubuntu.com>
Date: Tue, 10 Jun 2014 18:57:32 GMT
Subject: git rebase --skip stuck in a loop
Message-ID: <5397551C.4030709@ubuntu.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm in the middle of a long rebase and have had no trouble with git rebase --skip several times, but now it has become stuck:

psusi@devserv:~/parted.git$ git rebase --skip
Auto-merging libparted/arch/linux.c
CONFLICT (content): Merge conflict in libparted/arch/linux.c

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

psusi@devserv:~/parted.git$ cat .git/rebase-merge/msgnum
17

Each time I try to skip, it just keeps trying to reapply this one patch.  Any ideas?

git version 1.9.1

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJTl1UcAAoJEI5FoCIzSKrwwHIH/38Cm19zg+37zgckLiy/3GhN
3Gmil5kX+3KkIHCxlPz3Ti3xCA5baM7tDzFdDIKcx8N/i8oALgWeAWf1Euy9Ww1K
3etIAMKzO463kmV7UbgSbLz5DpYWSaGo9WiYAC7xklhQV94w1Ainx5Lo4kRv1Wfj
R9TpQgViFnW2gNJv1zw0qHLXk1/h88LlAQsBaaY6I4f/DOLhAte7rGinkTgZtjmo
G/9PUMudQcehG65ITPlNLtoFsM8UHadNMLwJts/B7Yq23XNyRF50IaT8c1A/irSU
mfYqdHCho3D4kq+k0u+t0Z0bj6pfvo4b0khLafrYLrWGHC5K+Z3lE63ysJ/Mdj8=
=LZ9q
-----END PGP SIGNATURE-----