{"thread":{"id":"3316","subject":"stg refresh/conflict resolution helptext/reality inconsistency","startedAt":"2006-02-13T00:14:05Z","lastAt":"2006-02-13T09:20:09Z","messageCount":2,"participants":["Ben Clifford","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16009","messageId":"Pine.OSX.4.64.0602131305420.19080@piva.hawaga.org.uk","threadId":"3316","inReplyTo":null,"subject":"stg refresh/conflict resolution helptext/reality inconsistency","fromName":"Ben Clifford","fromEmail":"benc@hawaga.org.uk","sentAt":"2006-02-13T00:14:05Z","receivedAt":"2006-02-13T00:14:05Z","isPatch":false,"sender":{"key":"benc@hawaga.org.uk","avatar":"https://gravatar.com/avatar/c7ce083471287f8e77b69dd147f757799d1efdd740727fd7e3003f33e88be898?d=mp&s=160"},"body":"\nThe following happens to me. The help text about using \"refresh\" doesn't \nseem to match up what I actually did. Am I doing something wrong?\n\n\n$ stg push\nPushing patch \"strcmp-ordering\"...Error: three-way merge tool failed for \nfile \"imap/src/osdep/unix/maildir.c\"\nThe merge failed during \"push\". Use \"refresh\" after fixing the conflicts\nstg push: git-merge-index failed (possible conflicts)\n\n[edit file to get rid of the <<< === >>> stuff]\n\n$ stg refresh\nstg refresh: Unsolved conflicts. Please resolve them first\n\n$ rm .git/conflicts\n\n$ stg refresh\nRefreshing patch \"strcmp-ordering\"... done\n\n\n\nThis is the stg version I'm using:\n\n$ stg --version\nStacked GIT 0.8\ngit version 1.1.6.gd19e\nPython version 2.3.5 (#1, Mar 20 2005, 20:38:20)\n[GCC 3.3 20030304 (Apple Computer, Inc. build 1809)]\n\n$ cd ~/src/stgit \n$ cg status | grep master\n    >master      0a01a6d0eaf0c6a70819da2f73fc659e7a83b569\n"},{"id":"16031","messageId":"b0943d9e0602130120p542c2b0ex@mail.gmail.com","threadId":"3316","inReplyTo":"Pine.OSX.4.64.0602131305420.19080@piva.hawaga.org.uk","subject":"Re: stg refresh/conflict resolution helptext/reality inconsistency","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2006-02-13T09:20:09Z","receivedAt":"2006-02-13T09:20:09Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 13/02/06, Ben Clifford <benc@hawaga.org.uk> wrote:\n> The following happens to me. The help text about using \"refresh\" doesn't\n> seem to match up what I actually did. Am I doing something wrong?\n\nIndeed, the 'refresh' help doesn't say anything about this. Dealing\nwith conflicts can be found in the tutorial.\n\n> $ stg push\n> Pushing patch \"strcmp-ordering\"...Error: three-way merge tool failed for\n> file \"imap/src/osdep/unix/maildir.c\"\n> The merge failed during \"push\". Use \"refresh\" after fixing the conflicts\n> stg push: git-merge-index failed (possible conflicts)\n>\n> [edit file to get rid of the <<< === >>> stuff]\n>\n> $ stg refresh\n> stg refresh: Unsolved conflicts. Please resolve them first\n\n'stg status -c' would show the conflict files.\n\n> $ rm .git/conflicts\n\n'stg resolved --all' does the same thing. I'd recommend that you use\nit instead since it also clears the index if the merge conflict wasn't\nhandled by gitmergeonefile.py.\n\nIf you don't like doing this, you can set 'autoresolved: yes' in your\nconfiguration file (/etc/stgitrc, ~/.stgitrc or .git/stgitrc) which\nwould mark all the conficts as resolved before refreshing. I\npersonally prefer to mark each individual conflict as resolved.\n\nSetting 'keeporig: no' would also prevent StGIT from generating the\noriginal versions of the file being merged.\n\n--\nCatalin\n"}]}