News for hackers. Stuff that matters.
Re:Diff tools on Mac OS X - an overview by wcdolphin on Thursday December 05, 2013 @11:28AM (#6855212)
As a Kaleidoscope user, I must say I am mostly unimpressed. While beautiful, you cannot edit a file in place while merging. Because of this fatal flaw, I find the program significantly less useful.

Further, I cannot remove a file from the diff or 'checkout --' the file, which is common for my workflow.

work -> X local commits to track progress -> diff with master -> cleanup into Y logical commits -> diff with master

Correct me if I am wrong, or if my flow seems weird.

Re:Diff tools on Mac OS X - an overview by mcmillion on Thursday December 05, 2013 @01:45PM (#6856249)
You can edit the merged file in place while merging.