git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* stgit - continue rebase after merge conflict?
@ 2008-02-26 14:57 Alex Chiang
  2008-02-26 16:56 ` Catalin Marinas
  0 siblings, 1 reply; 7+ messages in thread
From: Alex Chiang @ 2008-02-26 14:57 UTC (permalink / raw)
  To: catalin.marinas; +Cc: git

Hi Catalin,

How does one do a stg rebase if there are merge conflicts?

I see:

-------------------------------------------------------
achiang@blender:~/kernels/linux-2.6$ stg rebase origin
Upgraded branch stg-pci-slots to format version 2
Checking for changes in the working directory ... done
Popping all applied patches ... done
Rebasing to "origin" ... done
Pushing patch "0001-Remove-path-attribute-from-sgi_hotplug.patch" ... done
Pushing patch "0002-Construct-one-fakephp-slot-per-pci-slot.patch" ... 
  CONFLICT (content): Merge conflict in drivers/pci/hotplug/fakephp.c
  Error: The merge failed during "push".
         Revert the operation with "push --undo".
  stg rebase: 1 conflict(s)
-------------------------------------------------------

This output tells you how to undo the rebase, but doesn't give
any clues on how to continue it, like git would:

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

Doing an 'stg help rebase' isn't so helpful.

My *guess* is that I want to:

	- manually resolve the merge conflicts
	- stg refresh
	- ???

Any hints are appreciated.

Thanks.

/ac

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-02-29  8:38 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-26 14:57 stgit - continue rebase after merge conflict? Alex Chiang
2008-02-26 16:56 ` Catalin Marinas
2008-02-26 17:49   ` Alex Chiang
2008-02-27  9:38   ` Karl Hasselström
2008-02-28 17:38   ` Alex Chiang
2008-02-28 21:50     ` Catalin Marinas
2008-02-29  7:58       ` Karl Hasselström

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).