Git mergetool with Araxis
Monday 05 December 2011 at 10:00 pm. Used tags: araxis, diff, difftool, git, merge, mergetool
Just thought I'd drop this quick note should you also find the settings on the Araxis website don't work with your .gitconfig, I went through many attempts but this simple version worked for me.
[merge] tool = araxis [mergetool "araxis"] cmd = araxisgitmerge.exe \"$REMOTE\" \"$BASE\" \"$PWD/LOCAL\" \"$PWD/MERGED\"
…or alternatively…
git config --global merge.tool araxis git config --global mergetool.araxis.cmd 'araxisgitmerge.exe \"$REMOTE\" \"$BASE\" \"$PWD/LOCAL\" \"$PWD/MERGED\"'
Note: I added the Araxis installation directory to my PATH environment variable so not necessary above.
No comments
Wow! Can I work for you?! ** Breath of fresh air in management! **
Ian:There will have to be very strict guidelines, the last thing you want is dispute over “.. but you gave him 5 credits and her only 3?!” which will undoubtedly lead to the scheme being rescinded. That re…
Gary Ewan Park:This is a very interesting idea! It does leave some questions about how it is “policed”, and who decides whether a particular blog post, or SO answer warrants the credits, but I really do think that i…
Chris Marisic:Being both a developer and a leader of developers, I have found little to be as integral to the speed and success of software development as intellisense. This is also why I leverage R# on top of Vis…
Franc:I have to admit that Spark won me over very quickly, yes it is not perfect and yes I am not an expert in the subject but it has provided me with new skills. I have been a victim of its lack of intellis…
Randolph Burt:Intellisense helps me code faster and make less mistakes. However, from a personal point of view, it can be the difference between enjoying development and not enjoying development – and if you don’t …