<b>DeltaWalker</b><br><br>Five years ago, we had WinMerge and P4Merge doing f...

Terrence Miao - 2012-06-30 23:24:25+1000 - Updated: 2012-06-30 23:24:25+1000

DeltaWalker

Five years ago, we had WinMerge and P4Merge doing file comparison and merge. Today we have Deltopia DeltaWalker to carry on more sophisticated work, and do it better.

Base on Eclipse platform (so it can run on Windows, Mac and Linux), this genuine productive tool helping you look deeply inside your project, files or folder, sync, compare and merge, what you did great, what you did just crap.

Read more: http://www.deltopia.com/

Oleg Kiorsak - 2012-07-02 17:41:07+1000

+Terrence Miao looks very appealing, but is not free...
do you recommend Pro or standard?

Terrence Miao - 2012-07-02 23:27:47+1000

+Oleg Kiorsak I'm testing Oro version which have three way comparison. I can't whinge too much so far.

Oleg Kiorsak - 2012-07-02 23:31:12+1000

3-way comparison sounds impressive!... ;)

Terrence Miao - 2012-07-02 23:35:02+1000

Folders and three-way comparison and merge are big shot. Don't know what +Dean Budd Deano's opinion. He usually has a very extinguish taste if he is not sloshed.

Oleg Kiorsak - 2012-07-02 23:39:58+1000

+Terrence Miao what is the typical use case /need for a 3-way diff though?

Terrence Miao - 2012-07-03 00:00:45+1000

A typical use case for 3-way comparison:

Source code A, both you and me check out and modify. You finish first, check in as B, I modify as C and want to check in. Need 3-way comparison to see what you have changed from A to B and what I have changed from A to C. Though still can use two-way comparison. But 3-way is more clean and easily to understand.

Dean Budd - 2012-07-03 08:09:16+1000

There's always the odd occasion when you do have to merge, but merges should be so small as to be insignificant.

Always remember the practice of Continuous Integration

Terrence Miao - 2012-07-03 22:12:13+1000

+Dean Budd Good point Deano! Merge should be as insignificant as possible in development. If merge takes outstanding amount time, either it's design fault, or the false efficiency of task splitting.

One thing I like Git is it does smart merge. Most of time, you just commit your codes, Git has an intelligent solution merge them without too many human intervention.