From: Phillip Susi <psusi@ubuntu.com>
To: git@vger.kernel.org
Subject: git rebase --skip stuck in a loop
Date: Tue, 10 Jun 2014 14:57:32 -0400 [thread overview]
Message-ID: <5397551C.4030709@ubuntu.com> (raw)
-----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-----
next reply other threads:[~2014-06-10 19:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 18:57 Phillip Susi [this message]
2014-06-12 21:01 ` git rebase --skip stuck in a loop Phillip Susi
2014-06-13 1:02 ` brian m. carlson
2014-06-13 1:16 ` Phillip Susi
2014-06-13 7:34 ` Jeff King
2014-06-13 14:15 ` Phillip Susi
2014-06-15 22:39 ` brian m. carlson
2014-06-16 0:01 ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
2014-06-16 20:31 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5397551C.4030709@ubuntu.com \
--to=psusi@ubuntu.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.