From: Alex Chiang Date: Tue, 26 Feb 2008 17:49:28 GMT Subject: Re: stgit - continue rebase after merge conflict? Message-ID: <20080226174928.GA15862@ldl.fc.hp.com> In-Reply-To: * Catalin Marinas : > On 26/02/2008, Alex Chiang wrote: > > How does one do a stg rebase if there are merge conflicts? > > Basically, you solve the conflict, refresh the current patch and > continue with 'stg push' or 'stg goto '. Thanks. > The 'rebase' command doesn't store any information about the state of > the stack and cannot continue it. Maybe we'll do something in the next > release as the refactored code has support for transactions. I see. > > Doing an 'stg help rebase' isn't so helpful. > > Yes, indeed. It could be made better. How about this? /ac From: Alex Chiang Enhance rebase help string by providing guidance on merge conflict resolution during a rebase. Based on text suggested by Catalin Marinas. Signed-off-by: Alex Chiang --- diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py index 12faaf8..29d741b 100644 --- a/stgit/commands/rebase.py +++ b/stgit/commands/rebase.py @@ -27,7 +27,19 @@ help = 'move the stack base to another point in history' usage = """%prog [options] Pop all patches from current stack, move the stack base to the given - and push the patches back.""" + and push the patches back. + +If you experience merge conflicts, resolve the problem and continue +the rebase by executing the following sequence: + + $ stg resolved -a [-i] + $ stg refresh + $ stg goto top-patch + +Or if you want to skip that patch: + + $ stg push --undo + $ stg push next-patch..""" directory = DirectoryGotoToplevel() options = [make_option('-n', '--nopush',