From: Catalin Marinas <catalin.marinas@gmail.com>
To: Ben Clifford <benc@hawaga.org.uk>
Cc: git@vger.kernel.org
Subject: Re: stg refresh/conflict resolution helptext/reality inconsistency
Date: Mon, 13 Feb 2006 09:20:09 +0000 [thread overview]
Message-ID: <b0943d9e0602130120p542c2b0ex@mail.gmail.com> (raw)
In-Reply-To: <Pine.OSX.4.64.0602131305420.19080@piva.hawaga.org.uk>
On 13/02/06, Ben Clifford <benc@hawaga.org.uk> wrote:
> The following happens to me. The help text about using "refresh" doesn't
> seem to match up what I actually did. Am I doing something wrong?
Indeed, the 'refresh' help doesn't say anything about this. Dealing
with conflicts can be found in the tutorial.
> $ stg push
> Pushing patch "strcmp-ordering"...Error: three-way merge tool failed for
> file "imap/src/osdep/unix/maildir.c"
> The merge failed during "push". Use "refresh" after fixing the conflicts
> stg push: git-merge-index failed (possible conflicts)
>
> [edit file to get rid of the <<< === >>> stuff]
>
> $ stg refresh
> stg refresh: Unsolved conflicts. Please resolve them first
'stg status -c' would show the conflict files.
> $ rm .git/conflicts
'stg resolved --all' does the same thing. I'd recommend that you use
it instead since it also clears the index if the merge conflict wasn't
handled by gitmergeonefile.py.
If you don't like doing this, you can set 'autoresolved: yes' in your
configuration file (/etc/stgitrc, ~/.stgitrc or .git/stgitrc) which
would mark all the conficts as resolved before refreshing. I
personally prefer to mark each individual conflict as resolved.
Setting 'keeporig: no' would also prevent StGIT from generating the
original versions of the file being merged.
--
Catalin
prev parent reply other threads:[~2006-02-13 9:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-13 0:14 stg refresh/conflict resolution helptext/reality inconsistency Ben Clifford
2006-02-13 9:20 ` Catalin Marinas [this message]
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=b0943d9e0602130120p542c2b0ex@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=benc@hawaga.org.uk \
--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).