Tuesday, May 26, 2020

Sublime Merge 2

Dylan Johnston (Hacker News):

  • Repository-Level Tabs - use tabs to quickly navigate between multiple repositories
  • Upgraded Commit UI - focus on what’s important with an upgraded commit UI
  • Flexible Layouts - adapt the layout to fit your context and workflow
  • Hardware Acceleration - harness your device's power with OpenGL rendering

I love how fast this app is and the way it shows diffs with intra-line changes, syntax coloring/styles (albeit not for Swift), and the name of the modified function. I use it sometimes for searching and browsing a file’s history. But I haven’t been able to get used to it for regular daily Git use. The keyboard navigation between and within panes is weird. I can’t batch-select uncommitted files. Page Up/Down doesn’t work in the diff pane.

Previously:

4 Comments RSS · Twitter

I went ahead and updated the forum post with your feedback.

Why would you name your GUI git client "[Something] Merge"? (-‸ლ) ;^D

I briefly got really excited that Sublime had made a merge conflict app that might be a nice upgrade to KDiff3, which, for me, remains the gold standard in everything but its slightly user hostile UI and its notorious silence on the dev front. Which it looks like Merge is, but the heck if I want to learn another GUI git client to access it.

I'm interested, though. Not sure how I missed this. Wondered why ST wasn't being updated very quickly, and maybe this is why.

Ben Kennedy

@Ruffin: If you haven't tried Fork , check it out. It's a Source Tree-inspired clone. I switched to it about a year ago after finally having had enough of ST.

While it started out free, they now ask for $49, although it (at least so far) seems to be fully functional except for a periodic nag dialog.

Yup. I moved to Fork on both macOS and Windows. It feels a lot like Sourcetree. It lacks some of the features, but seems to be catching up quickly.

It feels like Sourcetree development should have picked up the pace after being acquired by a big corp, or at least steadily been evolved; instead, innovation appeared to slow down.

Leave a Comment