-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 So nobody has any ideas on what to check for or how to debug this? On 6/10/2014 2:57 PM, Phillip Susi wrote: > 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/ iQEcBAEBAgAGBQJTmhUcAAoJEI5FoCIzSKrwkjgIAKOclhuJPiNoWIEv1dBr4DBC IdwG9hY8lQPCN5Pg8th5CYk3ziX7iZ8+jaHEBaUYX2yehT1deg5WfsxU0uezWphH JyHMRX4kk7l1PW3/v3bEvZ0WYe77s4GB3m9XegjKwEL8xtGi7srEPsHgWB8gnFzE hswUMbq5mw9hoIpYnxEs18F2MOfP6i4J3gTilPrmq+hZCQyZrX/IsV5lR6kDXRES j7b3cr6n2EfUeWxKrwo+tMIBdGAgpMamWlzqM7gMND/YUswv84mD3b9lXjEfjqZf GfBXJSH/z0KLDKycYrDOZlryLEnx///N6STg2WGm0oo7ehAKn6Mtgi1rR5y/aYs= =bUQV -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html