We have recently switched from SVN to Git, and updated to Unity3D 4.3 and MonoDevelop 4.
I have used FileMerge with Xcode in the past, but most of our developers are on Windows.
Can we use MonoDevelop as an external tool for merge conflicts? If so, can you give us a few pointers on how to do it?
In Tools > Options > Diff, select "Custom" for External Diff Tool and/or Merge tool, and put in the command and arguments you would run from the command line.
On the other hand, I can't find any documentation about launching MonoDevelop from the command line, so I'd recommend trying it yourself (maybe with various /help parameters) to see if you can get the program to tell you how to launch a diff/merge.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG