git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: stg refresh/conflict resolution helptext/reality inconsistency

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Feb 13, 2006, 09:20 UTC
Message-ID
<b0943d9e0602130120p542c2b0ex@mail.gmail.com>
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.

Show 10 quoted lines
> $ 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

Previous: Ben Clifford
Message 2 of 2 in “stg refresh/conflict resolution helptext/reality inconsistency”
  1. Ben CliffordFeb 13, 2006
  2. Catalin MarinasFeb 13, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.