Stack Overflow
Stack Overflow

Questions tagged [araxis-merge]

10 questions
12
votes
4 answers

How to configure Araxis merge with Git Extensions

How to configure Araxis merge/diff with Git Extensions? I am trying to configure Araxis merge tool with "Git Extensions", but found no help, all links or searches directs to Git only (using shell), Where as Git Extensions is GUI tool, it has an…
PHP Avenger
  • 1,744
  • 6
  • 37
  • 66
4
votes
1 answer

How do I change the font size to zoom in and out in Araxis Merge on MacOS?

I went through all the settings and the Show Fonts panel and could not find any solution.
ubershmekel
  • 11,864
  • 10
  • 72
  • 89
4
votes
3 answers

How do I configure Araxis Merge for use with Visual Studio Git?

I have to use Git with Visual Studio 2017 now, and there doesn't seem to be a way to link Araxis Merge with Visual Studio / Git. This explains how to link Visual Studio TFS with Araxis. This explains how to link Git with Araxis. But how to link…
HerrimanCoder
  • 6,835
  • 24
  • 78
  • 158
3
votes
1 answer

Araxis merge three-way file comparison with Git

Below is the setting in my .gitconfig, but i only see 2 panes in Araxis Merge when I merge. What's the configuration to activate 3-way merge? [mergetool "araxis"] path = C:\\Programs\\Tools\\Araxis\\Araxis Merge\\compare.exe
Yannick Hammens
  • 53
  • 1
  • 5
3
votes
1 answer

How do I get araxis merge to work as a git difftool

I've been trying to setup araxis as git difftool, but it never works. I looked at this thread but it is incomplete: How do I configure Araxis Merge for use with Git? here is part of my global config. [difftool "araxis"] path = "C:/Program…
gmmo
  • 2,577
  • 3
  • 30
  • 56
2
votes
1 answer

git-diffall and git difftool --dir-diff not working with Araxis Merge

When I run git-diffall (https://github.com/thenigan/git-diffall) or git difftool --dir-diff (both referenced from @Tim Henigan's SO post), I get the following error: My configuration is: GitHub for Windows 1.2.6.4 f054d9f (which sits on top of…
David Peden
  • 17,596
  • 6
  • 52
  • 72
0
votes
0 answers

git duplex or 2 way merge with save of both merge panels at a time

The git supports different merge strategies, but nevertheless all these strategies are relied on idea to have has multiple inputs and only a single output. In mine case I want to have 2 outputs of 2 inputs in a single merge. Why this is…
Andry
  • 2,273
  • 29
  • 28
0
votes
1 answer

Why does p4v open a new window for each diff?

On my previous Windows 7 based computer (which I can no longer refer back to because it died), I used the Perforce p4v client, and changed its preferences to use Araxis Merge as the diff application. In that environment, if there was already an…
Mike Finch
  • 746
  • 1
  • 7
  • 20
0
votes
1 answer

How do I cause changes in Araxis Merge to apply to the corresponding files in my repo?

I'm confused about how to get Araxis Merge to make changes to the files in my repo. When I launch the application (in my case, from Tower, which is configured to use it) I see the expected comparisons, and can select which changes to move between…
orome
  • 45,163
  • 57
  • 202
  • 418
0
votes
1 answer

configuring araxis merge with git version 2.5.1.windows.1

I am trying to configure araxis merge with git and tried the thread below: How do I configure Araxis Merge for use with Git? however it did not work for me. here's how my .git config looks like: [user] email = myemail@email.com name =…
gmmo
  • 2,577
  • 3
  • 30
  • 56