Re: stgit - continue rebase after merge conflict?

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Feb 28, 2008, 21:50 UTC
Message-ID: <b0943d9e0802281350r3945d3f0qd0dd8ee61679e82d@mail.gmail.com>
In-Reply-To: <20080228173830.GA16045@ldl.fc.hp.com>

On 28/02/2008, Alex Chiang <achiang@hp.com> wrote:

Show 18 quoted lines

> * Catalin Marinas <catalin.marinas@gmail.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
>
>
> That goto command doesn't tell you about merge conflicts:

[...]

>  achiang@blender:~/kernels/linux-2.6$ stg goto 0004-ACPI-PCI-slot-detection-driver.patch
>  Pushed 0003-Introduce-pci_slot.patch (conflict)
>  Error: Merge conflict
>  Now at patch "0003-Introduce-pci_slot.patch"

It says that it's a merge conflict but isn't more precise than that. You can run 'stg status' to check the conflicts.

The reason is that you are probably using the development branch of StGIT and we (actually Karl) are refactoring the GIT objects handling. The 'goto' command (but not 'push') was moved to the new infrastructure but missed some of the UI stuff. They'll be added back.

I could use the stable branch until we sort out these issues.

-- 
Catalin