Visual Studio Code Compare (for merging) for CSS and JS

Question

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?

I think he meant git and not github.. anyway, check [this](https://github.com/git-tfs/git-tfs) — MilkyWayJoe, Jun 06 '12 at 20:59
How does this help with making file comparisons easier when checking in CSS/JS files? — John Chapman, Jun 06 '12 at 21:03
I didn't say anything about github...I also use Beyond Compare, its a great GUI tool. — raddrick, Jun 07 '12 at 13:19

score 2 · Accepted Answer · edited May 23 '17 at 12:07

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.

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

edited May 23 '17 at 12:07

Community

answered Jun 07 '12 at 13:21

score 2 · Answer 2 · answered Jun 07 '12 at 13:50

2

Devart Code Compare:

answered Jun 07 '12 at 13:50

Arran

score 1 · Answer 3 · answered Jun 07 '12 at 13:42

1

BeyondCompare is excellent (though paid for):

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.

answered Jun 07 '12 at 13:42

Alex KeySmith

I also highly recommend BeyondCompare, for me it is definitely worth its cost. – Radim Cernej Apr 23 '14 at 21:14

3 Answers3