Put the knife down and take a green herb, dude. (c) Ruffin Bailey 2001-2021

git-mergetool(1):

If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool..trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the resolution after the custom tool has exited.

Yeah, I'm going to say never set this to true. I've had a lot of trouble using kdiff3 with SourceTree and git, with kdiff3 saying things merged or SourceTree reading the exit wrong. I think it's my kdiff3, since I've had at least one flub on the command line.

So rather than have to restart merges or, worse, grab the original merge file and run it through WinMerge or similar, I'm setting this to false every time. Ask me. If I'm taking the human time to merge, I can take the human time to say whether it worked.

9 [mergetool "sourcetree"] 10 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancest 11 trustExitCode = false 12 [apply] 13 whitespace = nowarn 14 [merge] 15 tool = kdiff3

Labels: git, noteToSelf

title: Put the knife down and take a green herb, dude.	descrip: One feller's views on the state of everyday computer science & its application (and now, OTHER STUFF) who isn't rich enough to shell out for www.myfreakinfirst-andlast-name.com Using 89% of the same design the blog had in 2001.
FOR ENTERTAINMENT PURPOSES ONLY!!! Back-up your data and, when you bike, always wear white. As an Amazon Associate, I earn from qualifying purchases. Affiliate links in green.
x MarkUpDown is the best Markdown editor for professionals on Windows 10. It includes two-pane live preview, in-app uploads to imgur for image hosting, and MultiMarkdown table support. Features you won't find anywhere else include... MarkUpDown Multiline Table & Bootstrap Grid support. Beautiful Easy Actions that keep the Markdown flowing. HTML paste to paste HTML source into your documents. You've wasted more than $15 of your time looking for a great Markdown editor. Stop looking. MarkUpDown is the app you're looking for. Learn more or head over to the 'Store now!

Monday, June 18, 2012
Not trusting your merge tool's exit code in git git-mergetool(1): If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool..trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the resolution after the custom tool has exited. Yeah, I'm going to say never set this to true. I've had a lot of trouble using kdiff3 with SourceTree and git, with kdiff3 saying things merged or SourceTree reading the exit wrong. I think it's my kdiff3, since I've had at least one flub on the command line. So rather than have to restart merges or, worse, grab the original merge file and run it through WinMerge or similar, I'm setting this to false every time. Ask me. If I'm taking the human time to merge, I can take the human time to say whether it worked. `9 [mergetool "sourcetree"] 10 cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancest 11 trustExitCode = false 12 [apply] 13 whitespace = nowarn 14 [merge] 15 tool = kdiff3` Labels: git, noteToSelf posted by ruffin at 6/18/2012 08:35:00 AM

<< Older \| Newer >>