![]() Two base, two changes, and one resulting merge. PS: If one tool one day supports 5 views merging, this would really be awesome, because if you cherry-pick commits in Git you really have not one base but two. This makes merging somewhat harder in complex cases. ![]() The merge view (see screenshot) has only 3 panes, just like SourceGear Diff/Merge. So you can have some history diff on all files much simpler. Meld is a newer free tool that I'd prefer to SourceGear Diff/Merge: Now it's also working on most platforms (Windows/Linux/Mac) with the distinct advantage of natively supporting some source control like Git. Check that merge screens-shot and you'll see it's has the 3 views at least. SourceGear Diff/Merge may be my second free tool choice. Perforce tries to make it a bit hard to get their tool without their client. You cannot edit manually the files and you cannot manually align. My main disappointement with that tool is its kind of "read-only" interface. The Perforce Visual Client ( P4V) is a free tool that provides one of the most explicit interface for merging (see some screenshots). It has many features like advanced rules, editions, manual alignment. It integrates with many source control and works on Windows/Linux. It's somewhat less visual than P4V but way more than WinDiff. The good thing with its merge is that it let you see all 4 views: base, left, right, and merged result. I did the actual editing using git config -global -e and git config -local -e so that there was no mistaking editing the correct files.Beyond Compare 3, my favorite, has a merge functionality in the Pro edition. I replaced it with the contents of my local configuration (posted in the OP) and removed my tooling configuration from my local config.Īfter doing so, my problem went away entirely. Path = C:/Program Files/Araxis/Araxis Merge/Compare.exeĬmd = \"c:/Program Files/Araxis/Araxis Merge/Compare.exe\" -wait -merge -3 -a1 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" Path = c:/Program Files (x86)/KDiff3/kdiff3.exe My global configuration looked like this: I'm not sure how they got out of sync but that they were different at all was the dead giveaway. I did a diff between the output of git config -global -l and git config -local -l and realized that I had some conflicting (and erroneous) configurations for my difftools. After some more digging, I discovered the cause. ![]() Though my research above was accurate, it did not reveal the entire story. What steps do I need to perform to correct my configuration so that I can do a directory comparison using Araxis Merge?Īfter putting this down and coming back to it some time later, I discovered the cause of my issue. I'm not exactly sure how the parameters actually get passed to Araxis and therefore do not know how to troubleshoot this any further. ![]() Which is referenced from Araxis' documentation. Path = C:/Program Files/Araxis/Araxis Merge/compare.exe The actual local repo config contains this section: What is very strange is that this exact same setup works on my other machine.īoth git config -global diff.tool and git config -local diff.tool return "araxis" as expected. Posh Git PowerShell prompt which ships with GitHub for Windows.Araxis Merge 2013 Professional Edition 2013.4296.GitHub for Windows 1.2.6.4 f054d9f (which sits on top of msysgit 1.8.4).When I run git-diffall ( ) or git difftool -dir-diff (both referenced from Henigan's SO post), I get the following error:
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |