July 3rd, 2024

Sublime Merge

Sublime Merge, a Git client by Sublime Text creators, excels in speed, staging options, syntax highlighting, and conflict resolution. Users appreciate its efficiency, simplicity, and seamless GUI to command line transitions.

Read original articleLink Icon
Sublime Merge

Sublime Merge is a Git client developed by the creators of Sublime Text, offering features like line-by-line staging, commit editing, and exceptional performance across Mac, Windows, and Linux platforms. Users benefit from side-by-side Diffs, syntax highlighting, and instant repository-wide search capabilities. The tool simplifies conflict resolution with a built-in merge tool. Sublime Merge stands out for its speed, precise staging options, and Sublime Text-like syntax highlighting supporting over 40 languages. Users praise its simplicity and efficiency, with some noting its superiority over other Git clients. The tool provides transparency by displaying the exact Git commands being executed and allows seamless transitions between the GUI and command line. Additional features include customizable layouts, theming options, a command palette, blame and file history, submodule management, and Git Flow integration. Sublime Merge aims to offer a powerful and user-friendly Git client experience, aligning with the standards set by the Sublime Text family of products.

Link Icon 24 comments
By @tehnub - 5 months
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 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. And beyond that I like the generally attractive styling which makes viewing diffs and searching commit history (command+f, fuzzy find “contents:”, type what you want to search for) pleasant. It’s also totally snappy in most cases, even with multiple tabs for repos open — the only time I’ve seen it slow down was opening Unreal Engine, and that was at least a year ago so they may have made improvements on that. I use it every day and I am quite pleased with it.
By @pilif - 5 months
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 isn't very good.

By @chrizel - 5 months
Using Sublime Merge for over a year now after using Magit/Emacs mostly (and git command line for years before that).

What I like about Sublime Merge is its performance and the stage/unstage UI/UX is intuitive and fast backed by a competent text editor engine, similar to what I liked about Magit. Having multiple repositories open in a tab interface is also nice.

What you have to keep in mind is that Sublime Merge also includes a competent merge tool (hence the name). Sometimes we have to do more complex merges and Sublime Merge does this in an intuitive and integrated way, which would be a completely separate application in many other popular Git front-ends. Therefore the price is IMHO fair and justified. I can recommend giving it a try for a couple of weeks.

By @0x073 - 5 months
Since the auto update for sublimetext to version 4 where I don't have a license for I switched to vscode and never looked back.

At first I lost my trust and then I liked vsc more.

By @the_gipsy - 5 months
> 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.

By @solarkraft - 5 months
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).
By @4gotunameagain - 5 months
I have been using Sublime Merge for a while now, and I find it very useful.

I am a visual and spatial type, so I find the the way the information is organised there invaluable. I know I lose points for not being an ultimate shell dweller, but the experience just does not compare.

The only downside is that sometimes you cannot be sure which commands it will execute for a given functionality, and to do more specific things you have to do them manually. I guess this is unavoidable.

By @apocalyptic0n3 - 5 months
I've been using Sublime Merge since it was first announced (and Sublime Text since ST2 I think). Absolutely love the experience. It's less a Git GUI and more just the CLI displayed in a well-designed GUI, if that makes sense. It's not reinventing anything, just making it easier to keep on top of commits and what your current changes are. What I find nice is that unlike many of the other GUI options, Sublime never hides what it's doing. Anytime you are about to run a Git command, they show you it and give you the option to customize it. And you can run manual commands at any time with their command palette.

I don't mind the Git CLI, but I don't enjoy using it. It feels like I'm doing extra work and I'm not necessarily on top of the changes I've made. But Sublime gives me that while also not straying far from the CLI. It's the best client I've come across and well worth the license I paid for it.

By @mandalorianer - 5 months
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.
By @lsllc - 5 months
Long time Sublime user, both Sublime Text and Sublime Merge. I started back with ST2, ST3 and I have ST4 and have use Merge since it was released. These days I now mostly use nvim+lazyvim for coding but I do continue to use Sublime Merge as my primary git environment.

@ben-schaaf I'd love to see tree-sitter+LSP come to Sublime Text, as well as telescope+rg+fzf style fuzzy search. I find the lazyvim+telescope integration for finding files, finding buffers, looking for symbol references and general grepping with the live preview just fantastic.

One of the things I don't like about nvim+lazyvim is that I miss the IDE (workspace) aspect of ST, in that I have a window open per active project in Sublime. I use Neovide for nvim, but it really only lets you have one GUI window (I don't like to use Kitty/terminal windows for nvim because I can't cycle easily through them without mixing through other terminal stuff).

By @outcoldman - 5 months
I used ST since v2, and SM since the release. Sublime Text used to be my IDE for Python/C++/Go development. But later I switched to IntelliJ, and now Sublime Text is naked/pluginless editor for me, that I am ok to pay 100 every 3 years. I love the product.

I use Sublime Merge only as a diff tool, or a review tool before the commit. Love it as well.

By @user2342 - 5 months
I'm using Sublime Text since shortly before 2.0 and Sublime Merge since day one. Yet, I'm slowly losing interest in ST because of lacking language integrations and probably won't do any future paid upgrades. However, Sublime Merge is still essential for me and a no-brainer.
By @thiht - 5 months
This looks like a beautiful tool, but I'm not sure why I would use this instead of the Git integration in VSCode, and the CLI in VSCode's terminal? I can't really imagine using a workflow that would force me to use a different GUI for commits, diffs, merges, etc.
By @sam_goody - 5 months
Considering how much competition is in this space, a comparison or a page to help define its strengths would be useful.

Both against standalone tools such as Git-Fork, and built it tools such as VSCode Git [for the majority of the world that uses VSCode over Sublime-Text].

By @ggeorg - 5 months
Not doing much dev work at the moment... In the rare event I need to do some file comparisons or git commits I use meld. How does it compare to more novel tools like this? Any tools that consider the syntactic structure of code for diff/merging?
By @etoulas - 5 months
GitUp is an open source altetnative. Probably less feature rich than SM but powerful enough to be efficient.

https://github.com/git-up/GitUp

By @ElCapitanMarkla - 5 months
Here I am still using my trusty old GitX for commits, it hasn't been updated in about 10 years :) maybe I should stop being such a tight bastard and make the jump.
By @jamil7 - 5 months
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.
By @dixdotdev - 5 months
I've been becoming more curious about GUI git tools of late, for those that have used both how does this compare with GitButler?
By @tkuraku - 5 months
Sublime Merge is fantastic. I've moved on from sublime text, but sublime Merge is a tool I use everday. Invaluable.
By @dgellow - 5 months
curious what GUI framework they are using. I have a sublime merge license, everything feels really snappy
By @29athrowaway - 5 months
It's a good tool that integrates well with Sublime Text.

But a tremendously hard sell in 2024 considering the plethora of tools out there right now.

By @tstrimple - 5 months
I used to be a fan of the Sublime tools. But the complete lack of updates over a reasonable timescale have led me to move on to more supported platforms. I like the concept of a small team of developers providing a good tool. But the reality often means that you don't see any worthwhile upgrades. And I realize I'm commenting on HN, a place where the majority of people seem to have abandoned the hacker spirit and leaned more into curmudgeon aesthetics instead. The general sentiment here seems to be far more of don't try to innovate. Just do what we expect you to in the way we expect you to which matches how we would have built this tool 20 years ago.

> Cloud? Why? You can literally do anything on a VPS with Postgres!

> AI? Not on my watch! I can't imagine a tool that does more than VIM two decades ago!

> Javascript?! What a shit language. Everything should be written in Java or C++.