Programmer geekery.
Happy programmer. Happy, happy programmer. Our newest team member, R., recommended a program called Beyond Compare as better than Windiff. Beyond Compare is shareware, so if we want to keep it after testing it, we have to pay.
I just asked my boss to consider buying it. We can get 16 licenses for $150 (we only really need 8 just yet, but will soon be more - and it's $120 for 8 - so...). He's looking into it and, at that price, I really think it will happen.
Nice, nice program. Windiff shows which lines have changed, and where they've moved to. Beyond Compare is not completely reliable about showing you lines that have moved very far, but it is excellent at showing you which lines have changed, and within those lines, which characters have changed.
It also has a feature to move across files between the two folders you're looking at...or selected lines between the two files, in file view. And to filter by extension type, and a number of other nice features.
My day is much better, and I have a useful, nifty new toy. Painful merges just got much less so....
(I did a lengthy one with it, and compared the results with windiff. Perfect.)
I just asked my boss to consider buying it. We can get 16 licenses for $150 (we only really need 8 just yet, but will soon be more - and it's $120 for 8 - so...). He's looking into it and, at that price, I really think it will happen.
Nice, nice program. Windiff shows which lines have changed, and where they've moved to. Beyond Compare is not completely reliable about showing you lines that have moved very far, but it is excellent at showing you which lines have changed, and within those lines, which characters have changed.
It also has a feature to move across files between the two folders you're looking at...or selected lines between the two files, in file view. And to filter by extension type, and a number of other nice features.
My day is much better, and I have a useful, nifty new toy. Painful merges just got much less so....
(I did a lengthy one with it, and compared the results with windiff. Perfect.)