5 ms·
I haven't found a diff tool for macOS that is as good as WinMerge from fifteen years ago. Kaleidoscope is fairly close but you still can't merge individual lin
by sjwright 6y ago
I haven't found a diff tool for macOS that is as good as WinMerge from fifteen years ago.
Kaleidoscope is fairly close but you still can't merge individual lines from a block of changes, and you can't make up for it with manual free-form editing of the text. Sometimes I want to perform the merge by copying and pasting segments myself. Sometimes I want to fix up indentation after merging.
- sixstringtheory 6y agoHeavy Kaleidoscope user here. You can definitely edit the text in the merge column, I've had to do it many times for exactly what you're describing!
- sjwright 6y agoReally, how? I've got a Kaleidoscope merge open right now and I can't edit text. Is there a mode I need to toggle or a button I need to press? I've looked through all the menu items, preferences, all of the toggle switches in the UI, and searched the documentation. I'm running version 2.3.2.
- sjwright 6y agoPressed on by your certitude, I tried googling it again and yep, you definitely can't. https://twitter.com/kaleidoscopeapp/status/341930870900416512 https://twitter.com/kaleidoscopeapp/status/34193087090041651... (But you can when dealing with merge conflicts? Wow. Quite remarkable for a seemingly basic bit of core functionality to stay humming on the to-do list for seven years, despite the very same feature already implemented in a nearly identical context!)
- sixstringtheory 6y agoAh, I’m so sorry. I said it was the exact thing you were describing, but I misunderstood you. I indeed meant conflict resolution, and it is surprising they left it out elsewhere.