* stg refresh/conflict resolution helptext/reality inconsistency
@ 2006-02-13 0:14 Ben Clifford
2006-02-13 9:20 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Ben Clifford @ 2006-02-13 0:14 UTC (permalink / raw)
To: git, catalin.marinas
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: stg refresh/conflict resolution helptext/reality inconsistency
2006-02-13 0:14 stg refresh/conflict resolution helptext/reality inconsistency Ben Clifford
@ 2006-02-13 9:20 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2006-02-13 9:20 UTC (permalink / raw)
To: Ben Clifford; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-02-13 9:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-13 0:14 stg refresh/conflict resolution helptext/reality inconsistency Ben Clifford
2006-02-13 9:20 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).