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

stg refresh/conflict resolution helptext/reality inconsistency

From
Ben Clifford <benc@hawaga.org.uk>
Date
Feb 13, 2006, 00:14 UTC
Message-ID
<Pine.OSX.4.64.0602131305420.19080@piva.hawaga.org.uk>

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?

$ 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

$ rm .git/conflicts

$ stg refresh Refreshing patch "strcmp-ordering"... done

This is the stg version I'm using:

$ stg --version Stacked GIT 0.8 git version 1.1.6.gd19e Python version 2.3.5 (#1, Mar 20 2005, 20:38:20) [GCC 3.3 20030304 (Apple Computer, Inc. build 1809)]

$ cd ~/src/stgit 
$ cg status | grep master
    >master      0a01a6d0eaf0c6a70819da2f73fc659e7a83b569
Next: Catalin Marinas
Message 1 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.