Joined October 2011
·
gasienica

Daniel Gasienica

Software Engineer at Zynga
·
Seattle, USA
·
·
·

Posted to git easy merging with merging tools! over 1 year ago

Great tip, thanks! Previously I had the following which worked, but it gave me all kinds of Mac OS X warnings in the Terminal:

[difftool]
    prompt = false
[difftool "p4merge"]
    external = "/Applications/p4merge.app/Contents/MacOS/p4merge" "$2" "$5" ||
[merge]
    tool = p4merge
[mergetool]
    prompt = false
    keepBackup = false
[mergetool "p4merge"]
    path = "/Applications/p4merge.app/Contents/MacOS/p4merge"
    trustExitCode = false

However, I still recommend adding prompt = false to [mergetool] and [difftool].

Achievements
89 Karma
0 Total ProTip Views
Mongoose
Have at least one original repo where Ruby is the dominant language
Altruist
Increase developer well-being by sharing at least 20 open source projects
Walrus
The walrus is no stranger to variety. Use at least 4 different languages throughout all your repos
Forked
Have a project valued enough to be forked by someone else
Charity
Fork and commit to someone's open source project in need
Python
Would you expect anything less? Have at least one original repo where Python is the dominant language
Honey Badger
Have at least one original Node.js-specific repo
Raven
Have at least one original repo where some form of shell script is the dominant language
Kona
Have at least one original repo where CoffeeScript is the dominant language
Interests & Skills
JavaScript
ActionScript
Python
Shell
ASP
Haskell
Open Source
Node.js
Perl
CSS
CoffeeScript
Ruby