CODEWITHSUNDEEP
gitmergetoolbeyondcompare4
rrreee
rrreee

Reputation: 893

Using BeyondCompare as the mergetool with git, brings up the diff, not the merge function

With the mergetool configured for git, I have manufactured a conflict, and then run 'git mergetool', and yet no matter how its configured, it is bringing up a diff, not a merge window.

Upvotes: 2

Views: 119

Answers (1)

rrreee
rrreee

Reputation: 893

The actual problem was that the Standard edition does not include the text merge functionality. So if you have this problem, you should either buy the Pro edition, or find a different merge tool. It would be better if BeyondCompare gave an error in the case where the command line is trying to do a merge, but the license is not for the Pro edition. Bringing up the diff tool in that case is really not helpful.

Upvotes: 2

Related Questions