Embed Size (px)
Citation preview
Three-Ways Are Better(When Merging)
Stephen VanceNew England Software Engineers
April 23, 2015
Three-ways Are Better 2
Merge-aphobia?
Copyright 2015, Stephen Vance
Three-ways Are Better 3
Diffing – Really?
Copyright 2015, Stephen Vance
Three-ways Are Better 4
We Can Do Better!
Copyright 2015, Stephen Vance
Three-ways Are Better 5
But How?
1. Download and Install P4Merge2. Add it to your PATH
export PATH=${PATH}:/Applications/p4merge.app/Contents/MacOS
3. Configure git to know about itgit config --global merge.tool p4mergegit difftool --tool-help
4. Use it!git difftool some.txt
Copyright 2015, Stephen Vance
Three-ways Are Better 6
Meanwhile, Back In The Console
• You can turn that off– git difftool --no-prompt some.txt– git config mergetool.prompt off
Copyright 2015, Stephen Vance
Three-ways Are Better 7
I Thought You Said “Merging”
git config --global merge.tool p4merge
Copyright 2015, Stephen Vance
Three-ways Are Better 8
Set Up Your Merge
git checkout mastergit merge othergit mergetool
Copyright 2015, Stephen Vance
Three-ways Are Better 9
Three-way Merges!
Copyright 2015, Stephen Vance
Three-ways Are Better 10
Demo
Copyright 2015, Stephen Vance
Three-ways Are Better 11
Thank You!
[email protected]@StephenRVanceLinkedIn: srvance
Copyright 2015, Stephen Vance
