From: Ben Clifford <benc@hawaga.org.uk>
Date: Mon, 13 Feb 2006 00:14:05 GMT
Subject: stg refresh/conflict resolution helptext/reality inconsistency
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