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. |
|
Friday, June 01, 2012 | |
How to use kdiff3 as a 3-way merge tool with mercurial, git, and Tower.app - Ted Naleid: A 3-way merge actually has four important sources of information: Personally, I prefer seeing just two files with undos. You view the changes, chose a winner, have the section of both files match that choice, and *POOF*, the highlighting for that conflict in the file margins disappears as if it were never a conflict. WinMerge works about perfectly. But though I'm not sure I get three panes (what's canonical again?), I do get 4-panes. Do I want what I've got, what you've got, or what we started from (though, as my WinMerge pref shows, I'm assuming we don't want what we started from any more, else what kinda programming flunkies are we, anyhow)? And once I select a "winner", show me in a fourth (or, to follow WinMerge or JEdit's JDiff, just make the winning change to all three). KDiff3 does that just well enough that I'm using it to merge in git on OS X now. SourceTree won't call it successfully yet for some reason, but git mergetool works fine from iterm for now. Setup is only slightly unintuitive, and though the UI is a little klunky, it works just fine. What's not to like about OSS? Labels: git posted by ruffin at 6/01/2012 10:53:00 AM |
|
| |
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...
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! |
![]() |
|
|