Re: stgit - continue rebase after merge conflict?

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Feb 26, 2008, 16:56 UTC
Message-ID: <b0943d9e0802260856j6e9b0053ne4916149d8e4387c@mail.gmail.com>
In-Reply-To: <20080226145725.GA24987@ldl.fc.hp.com>

On 26/02/2008, Alex Chiang <achiang@hp.com> 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>'. The 'rebase' command does 'pop --all', 'git reset', 'push --all'. In your conflict, the base of the stack was already changed to the latest and hence only push/goto is needed. To fix it:

$ vi files # or simply use 'resolved -i' below $ 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..

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.

Yet another option is to enable the automatic interactive merge ('git config stgit.autoimerge yes') and, at a conflict, it calls your three-way merge tool (emacs, xxdiff etc.). If the merge tool succeeds, the rebase will simply continue.

Show 10 quoted lines

>  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.

Yes, indeed. It could be made better.

-- 
Catalin