You can make a symlink of that into your path, but I assume in the instructions below only that you’ve got kdiff3 in your /Applications folder. It can be run from the command line at /Applications/kdiff3.app/Contents/MacOS/kdiff3. The app is a simple wrapper around a Qt-based application.
Installing kdiff3 is as easy as downloading the latest version from sourceforge and copying it to your /Applications directory. If there are other files with merge conflicts, you can repeat the process with those files. Your SCM should see the MERGE_RESULT no longer has any merge conflicts and will mark it as resolved, ready for you to commit it. Once you’ve resolved your file, simply save it (cmd-S) and quit out of kdiff3.
#Kdiff3 for mac manual#
You can also directly edit the file in the MERGE_RESULT pane to make manual changes if the correct merge is not the exact text in A/B/C.Īnother option, if you want to take all of the changes from one file and discard any changes from the others, is to go to the “Merge” menu and pick one of “Choose A Everywhere”, “Choose B Everywhere”, or “Choose C Everywhere”.
#Kdiff3 for mac code#
It’s possible to press more than one button if code from multiple panes is valid. So if the LOCAL file (your file) had the right changes in it, you’d press B. Pressing one of those buttons will resolve the conflict with the code from pane A, B, or C on top. When a conflict is highlighted, you can press any combination of the A, B, and C buttons in the toolbar. You can move from one unresolved conflict to the next using the triple up and triple-down colored arrows in the middle of the tool bar. It currently has a Merge Conflict that you need to fix. If you run your SCM’s merge command (here, in mercurial: hg merge -r 2), and have kdiff3 configured as your merge tool, you’ll get a pop-up window like this: As you can see, it shows you all 4 pieces of information, BASE, LOCAL, and REMOTE on top, and the MERGE_RESULT file on the bottom.
If you’ve got 2 heads that you need to merge in your current repository: We made this modification to file.txt: diff -git a/file.txt b/file.txtĪnd they made this change to the same file and line: diff -git a/file.txt b/file.txt But like linux, it’s functional and can help you quickly be productive once you get over the learning curve. It’s not pretty it’s cross-platform Qt based so it has a very old-school linux GUI feel to it. Most other 3-way merge tools either conflate or omit the BASE and that can make it harder to see what the right thing to do is. Where you came from ( LOCAL), where the other person’s changes came from ( REMOTE), where you both started ( BASE) and where you are now ( MERGE_RESULT). You often need to see all four of these pieces of information to make intelligent choices.
#Kdiff3 for mac free#
There are no good-looking, “mac-like” merge tools, but if you swallow your pride there are a few different options for 3-way merges, including Araxis Merge ($$$!), DiffMerge, DeltaWalker, and FileMerge which comes free with XCode. By this, I mean real, 3-way merges with all of the information you need in front of you. There are a few very nice looking, mac-like diff tools for OSX (Kaleidoscope and Changes come to mind), but none for doing “real” merges.
0 kommentar(er)
