It's not the same without you
Join the community to find out what other Atlassian users are discussing, debating and creating.
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.
MonoDevelop is also a Git client and works for resolving conflicts with text files.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Good-bye, switching to GitHub Client, they seem a better fit for our situation.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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 groupConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.
Start an AUGYou're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.