git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git rebase --skip stuck in a loop

From
PSPhillip Susi <psusi@ubuntu.com>
Date
Jun 12, 2014, 21:01 UTC
Message-ID
<539A151C.50307@ubuntu.com>
In-Reply-To
<5397551C.4030709@ubuntu.com>
-----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:
Show 19 quoted lines
> 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-----

Previous: Phillip SusiNext: brian m. carlson
Message 2 of 9 in “git rebase --skip stuck in a loop”
  1. Phillip SusiJun 10, 2014
  2. Phillip SusiJun 12, 2014
  3. brian m. carlsonJun 13, 2014
  4. Phillip SusiJun 13, 2014
  5. Jeff KingJun 13, 2014
  6. Phillip SusiJun 13, 2014
  7. brian m. carlsonJun 15, 2014
  8. rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson, Jun 16, 2014
  9. Junio C HamanoJun 16, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.