what do you people use as a file and directory comparison tool? I've been using Winmerge, but it's too dumb for my tastes at times. Been looking at Araxis and BeyondCompare...

6/11/2012 11:38:49 AM

we use BeyondCompare at work; IMO it is a great compare tool

6/11/2012 11:47:20 AM

BeyondCompare is pretty much the bees knees. Everyone I know uses that or WinDiff. Though honestly I've stopped using either now that diff is built into VS12

6/11/2012 11:47:23 AM

I use SourceGear Diffmerge most of the time. Occasionally I'll use WinMerge

6/11/2012 12:04:16 PM

++BeyondCompare. Noen does the VS12 diff tool do a 3-way merge?

6/11/2012 12:12:06 PM

I use the one built into eclipse, works pretty well, recursive directories, revision diff management, etc.

6/11/2012 1:01:45 PM

^^Yes there is a 3-way diff too (for TFS)

sxsxs and sxs+under
http://tfspreview.com/media/home/features/NewTourImages/full/3WayMerge.png

6/11/2012 1:12:32 PM

windiff or bitwise OR

6/11/2012 2:52:03 PM

WinMerge4Lyfe

6/11/2012 3:05:51 PM

Winmerge...might try BeyondCompare though.

6/11/2012 4:05:05 PM

maybe I'm confused about what we're talking about here, but I use diff and git, if applicable

6/11/2012 5:47:52 PM

but diff doesn't have that GUI goodness that Visual Studio users crave

still at least it is available in the GNUWin32 project: http://getgnuwin32.sourceforge.net/

6/11/2012 7:12:32 PM

I recommend Beyond Compare. I have also used a freebie called Diffmerge that is descent but not full featured.

6/11/2012 11:41:26 PM

wait wait wait DiffMerge is free now

imago try it

6/12/2012 3:53:07 AM

Why not use git locally? You can branch and merge and commit to your hearts content.

6/12/2012 2:09:58 PM

Because diffing conflicts in a merge is painful as hell with the git cmdline tools.

6/12/2012 4:18:02 PM

I've done some hellacious merges and never found that to be the case. git's strong point is it's merging.

6/12/2012 5:06:31 PM

I'm not talking about the process of merging. I'm talking about using a diff tool to understand merge conflicts with more context. Maybe a small difference, but it's been a pretty big one for me.

6/12/2012 6:38:20 PM