From: Catalin Marinas Date: Mon, 13 Feb 2006 09:20:09 GMT Subject: Re: stg refresh/conflict resolution helptext/reality inconsistency Message-ID: In-Reply-To: On 13/02/06, Ben Clifford 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