From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Alex Chiang" <achiang@hp.com>,
"Catalin Marinas" <catalin.marinas@gmail.com>,
git@vger.kernel.org
Subject: Re: stgit - continue rebase after merge conflict?
Date: Thu, 28 Feb 2008 21:50:04 +0000 [thread overview]
Message-ID: <b0943d9e0802281350r3945d3f0qd0dd8ee61679e82d@mail.gmail.com> (raw)
In-Reply-To: <20080228173830.GA16045@ldl.fc.hp.com>
On 28/02/2008, Alex Chiang <achiang@hp.com> wrote:
> * 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
next prev parent reply other threads:[~2008-02-28 21:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-26 14:57 stgit - continue rebase after merge conflict? Alex Chiang
2008-02-26 16:56 ` Catalin Marinas
2008-02-26 17:49 ` Alex Chiang
2008-02-27 9:38 ` Karl Hasselström
2008-02-28 17:38 ` Alex Chiang
2008-02-28 21:50 ` Catalin Marinas [this message]
2008-02-29 7:58 ` Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0943d9e0802281350r3945d3f0qd0dd8ee61679e82d@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=achiang@hp.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).