2

In Visual Studio 2010 the code comparison tool used when merging changes is not very good when trying to merge CSS and JS files.

Any suggestions on a good third-party merge tool that works well with CSS and JS files and that we can integrate with VS2010?

Improve this question
5
  • git. it's really a saviour once you're used to it Commented Jun 6, 2012 at 20:53
  • I think he meant git and not github.. anyway, check this Commented Jun 6, 2012 at 20:59
  • 1
    How does this help with making file comparisons easier when checking in CSS/JS files? Commented Jun 6, 2012 at 21:03
  • Beyond Compare is what we use. It's excellent. Commented Jun 6, 2012 at 21:09
  • I didn't say anything about github...I also use Beyond Compare, its a great GUI tool. Commented Jun 7, 2012 at 13:19

3 Answers 3

Reset to default
2

WinMerge is free, open-source, and Just Works.

Please see Change Visual Studio Compare Tool To WinMerge for instructions on how to set-up VS2010 to use WinMerge.

And here are notes on getting VS (Team System) 2008 to use WinMerge.

If you're using VisualSourceSafe (ugh), you need some additional configuration.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments

2

Devart Code Compare:

http://www.devart.com/codecompare/

Improve this answer

Comments

1

BeyondCompare is excellent (though paid for):

http://www.scootersoftware.com/index.php

And has intructions for integrating with TFS: http://www.scootersoftware.com/support.php?zz=kb_vcs#tfs

n.b. I don't work for scooter software, I'm just a fan. My work has a group license, so depends if you want to pay for it.

Though I've also used WinMerge in the past and I'm a fan of that to.

Improve this answer

1 Comment

I also highly recommend BeyondCompare, for me it is definitely worth its cost.

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.