stgit - continue rebase after merge conflict?

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