# stg refresh/conflict resolution helptext/reality inconsistency

2 messages from 2006-02-13 to 2006-02-13. Participants: Ben Clifford, Catalin Marinas.
Thread: https://gitlist.dev/t/3316

## Ben Clifford, 2006-02-13 00:14

Subject: stg refresh/conflict resolution helptext/reality inconsistency
Message-ID: <Pine.OSX.4.64.0602131305420.19080@piva.hawaga.org.uk>
URL: https://gitlist.dev/e/Pine.OSX.4.64.0602131305420.19080%40piva.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

```

## Catalin Marinas, 2006-02-13 09:20

Subject: Re: stg refresh/conflict resolution helptext/reality inconsistency
Message-ID: <b0943d9e0602130120p542c2b0ex@mail.gmail.com>
URL: https://gitlist.dev/e/b0943d9e0602130120p542c2b0ex%40mail.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.

> $ 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

```