These scenarios require the use of a three-way-diff or a two-way-diff operation, respectively. In case of a merge conflict there are two possible scenarios: one, in which a common base version exists and second, where it does not exist. I put them under /usr/local/bin on my Mac. It doesn’t matter where you place the binaries as long as they are available. I assume that you’ve got Araxis Merge installed including the binaries that are located in the “Utilities” directory in the distribution. Luckily new commands can be configured by hand but a quick Google search didn’t turn up anything I could have simply copy-pasted to get it working. ![]() I wanted to use the great Araxis Merge tool as a helper to solve merge conflicts with Git but currently it is not supported out-of-the-box.
0 Comments
Leave a Reply. |