* Catalin Marinas <catalin.marinas@xxxxxxxxx>:
> On 26/02/2008, Alex Chiang <achiang@xxxxxx> 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 <top patch>'.
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 <achiang@xxxxxx>
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 <achiang@xxxxxx>
---
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] <new-base-id>
Pop all patches from current stack, move the stack base to the given
-<new-base-id> and push the patches back."""
+<new-base-id> 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',
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
