Oh god I am so sorry:(

Please move, for the love of anything, that has got to be the pits.
Noob-gui!

I don't like wikis either, since most people are not qualified to edit them. Or should I say sloppy?

Laws against broken software would be helpful. Not the usual civil code, which is not sufficient for something like complex hardware/software relations.Things can break down after many years.

Why didn't you just save after every few minutes? If you didn't want to save any unnecessery changes, you could've created a backup copy...

btw. it's cool to hear there is an autosave, btw :-)

But remember, it's better to be safe than sorry ;P

I know this is a joke, but their diff interface is surprisingly good. We use Beyond Compare at work and despite having a few more options (some of which are actually useful) I'd still rather use the one provided by the GitHub Windows client.

Any of you know WinMerge? I love that program to bits! Not only is it free, it's also extremely powerful, both for folder and file comparisons. And it has a single feature which I haven't seen anywhere else, which is weird considering how simple it is: You can paste text directly into it without having to save it as a file first. For someone who frequently has to diff large stored procedures from different databases, that is a godsend. Plus, it integrates automatically with TortoiseSVN.

Sublime Text 2, the editor I use for any non-C#/Java code I write has that option as a plugin. I used WinMerge for a while but it didn't really want to work with Accurev (our SCM) and Beyond Compare just fit me better (the HTML reports are priceless).

Agreed, WinMerge and Sublime are ok, but Beyond Compare takes the biscuit. Apart from csproj / dbproj files. It's really bad at XML.

Looking at the pricing for Beyond Compare, I think that what it offers over WinMerge is not nearly enough to justify the exorbitant cost of a site or enterprise license, unless you really need those extra features.

And if it can't work directly with pasted text, then it doesn't cover my daily needs anyway.

Beyond Compare 3 compares entire directory structures and lets you drill down into an arbitrary depth of compressed files as well.

I don't know if everyone needs that, but I do.

So does WinMerge. I don't know if it does compressed files, I've never tried.

But as I said, if you need the extra features, well, then you need them. If you don't need them however, it seems like a waste to shell out thousands of dollars for something you can get for free elsewhere.

Do you need to do code merges? that's where it really shines. If you're not trying to work with a team on the same file, you probably won't see the impact. When you do, it's invaluable.

You mean merging changes from different branches? I don't in my current job, but I used to, and yes, in that situation, a three-way merge functionality is essential, especially if it integrates to the version control system. I used to work with ClearCase many years ago, which facilitated that functionality nicely, but that was both the version control and diff/merge tool in a single package.

When you get to doing that regularly, I'd recommend giving it another shot. The three way merge tool in TFS is laughable. I don't know about the rest.

I develop on linux, and typically just use gvimdiff. perforce has a reasonable 3 way merge tool, but it's horrid to try to teach it which things you want it to compare. Sigh.

Sometimes I end up using diff and patch instead of the scm to get changes around. It's more reliable..... Really.