Live data from Hacker News

Sublime Merge

sublimemerge.com

41–50 of 97 posts

Re: Sublime Merge

#41

> Commit Faster - Stage Files, Hunks and Lines with no waiting - Sublime Merge is really, really fast. Fast as opposed to what? What could possibly be slow here? It's just local git operations.

More mentally taxing workflows. Git is fast enough, but human brain is not, especially in complex cases. Untangling the view is a boon.

Re: Sublime Merge

#42

Earlier quoted context omitted.

https://git-fork.com/

Mac and Windows only? What the hell.

I dislike that too, but one reason is that they're actually using the platform native UI toolkits (making it wonderfully well integrated and snappy). Adding another platform would be a lot of work and the authors don't believe that Linux even has a clear platform native UI toolkit (though imo GTK would be a safe choice).

Re: Sublime Merge

#43
post #20

I liked Sublime Merge when I used it a few years ago, mainly because it's available on Linux. There were some things about the UI that were bugging me however. Nowadays I'm pretty happy with Fork (available for Windows & macOS).

Sorry, but it sounds like you're shilling for Fork.

I am because I've been happy with it for the past couple of years.

Re: Sublime Merge

#44
post #22

I used Git on the command line exclusively for many years and occasionally tried the built-in Git tools for various editors as well as GitHub Desktop, but I never felt they were a lift in usability over the CLI or very pleasant to use. That was until I tried Sublime Merge on a whim. One thing I like is how keyboard oriented most of it is, and how it maps quite closely to CLI commands. If I want to commit I open the c…

> If I want to commit I open the command palette with command+p and then fuzzy-search for commit with “co…” or “cm” or whatever you like, and it brings up the suggested commands which I can select with enter.

cm is exactly how I think of commit, but I use it as a custom command on the cli.

I use my cm command like:

cm “Small refactoring of quux and baz”

and it runs

git commit -m “Small refactoring of quux and baz”

Similarly I have other two letter commands for all of the other git operations I most frequently use. (I.e for almost all of the ones I use day to day.)

Re: Sublime Merge

#45

I liked Sublime Merge when I used it a few years ago, mainly because it's available on Linux. There were some things about the UI that were bugging me however. Nowadays I'm pretty happy with Fork (available for Windows & macOS).

What was bugging you about the UI?

I sadly don't exactly remember, but I think it was something about resizing behavior and the occasinal inability to stage specific parts.

Re: Sublime Merge

#46
I forgot I had this installed and purchased as I tend to just use the cli for everything and have never really used a GUI. I'll try it out for some trickier merges.

Re: Sublime Merge

#47
post #24

Sublime Merge is cough sublimely good at performing 3-way merges. I don't like it as much as a generic git frontend (nothing beats the command line once you're used to it, but for 3-way merges, it's absolutely perfect and I have yet to see anything better. Another very good tool for 3-way merges is meld, but the macOS port (where I do most of my development work on) is not very good, mostly because the GTK macOS port…

[deleted]

Re: Sublime Merge

#48

When Sublime Merge was initially released I liked it a lot. Mostly because of it's snappy speed (like Sublime Text). But since a year or so I'm using lazygit ( https://github.com/jesseduffield/lazygit ), which at least for me is the best git tool ever.

LazyGit is extremely good, especially when invoked from within NeoVim. I use it as a part of the LazyVim setup.

Re: Sublime Merge

#50

> Commit Faster - Stage Files, Hunks and Lines with no waiting - Sublime Merge is really, really fast. Fast as opposed to what? What could possibly be slow here? It's just local git operations.

`git add` can be quite slow when handling large files, in large repositories, with a large index or on slow platforms. For instance this optimization in git brought the runtime of `git add .` on Windows with 200k files from 6s to 3s: https://github.com/git/git/commit/d1664e73ad96aa08735bf81d48....

100ms let alone 3s is much too long a wait, so Sublime Merge predicts the outcome of staging and presents that immediately. This made a noticeable improvement to responsiveness even on small repositories under Linux.

Post reply on HN