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 articleSublime 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.
Related
I kind of like rebasing
People debate Git workflows, favoring rebasing for a linear history. Redowan Delowar prefers rebasing to consolidate changes and maintain a clean commit history. They discuss interactive rebasing benefits, squashing commits, handling conflicts, and offer practical tips.
Windows File Explorer will be more powerful with version control and 7z
Microsoft updates File Explorer with Git integration for version control, native support for 7-zip and TAR compression formats. Aimed at enhancing project management and file organization for users, announced at Microsoft Build.
My .gitconfig File Dissected
The article delves into .gitconfig file breakdown, covering user details, GPG key signing, Git aliases, and workflow optimization tips. Encourages readers to customize their .gitconfig for enhanced Git usage.
Git: Please Stop Squash Merging
Lucas Seiki Oshiro explains the drawbacks of squash merging in Git, debunking the belief that it condenses changes effectively. He clarifies Git's inner workings and the implications of squash merging.
A Better Merge Workflow with Jujutsu
A new merge workflow using Jujutsu, a modern VCS compatible with Git, introduces The Austin™ Mega Merge Strategy®. It simplifies merge commits, amending commits, and selecting commits efficiently, enhancing collaboration and code review processes with advanced commit graph manipulation.
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.
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.
At first I lost my trust and then I liked vsc more.
Fast as opposed to what? What could possibly be slow here? It's just local git operations.
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.
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.
@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).
I use Sublime Merge only as a diff tool, or a review tool before the commit. Love it as well.
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].
But a tremendously hard sell in 2024 considering the plethora of tools out there right now.
> 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++.
Related
I kind of like rebasing
People debate Git workflows, favoring rebasing for a linear history. Redowan Delowar prefers rebasing to consolidate changes and maintain a clean commit history. They discuss interactive rebasing benefits, squashing commits, handling conflicts, and offer practical tips.
Windows File Explorer will be more powerful with version control and 7z
Microsoft updates File Explorer with Git integration for version control, native support for 7-zip and TAR compression formats. Aimed at enhancing project management and file organization for users, announced at Microsoft Build.
My .gitconfig File Dissected
The article delves into .gitconfig file breakdown, covering user details, GPG key signing, Git aliases, and workflow optimization tips. Encourages readers to customize their .gitconfig for enhanced Git usage.
Git: Please Stop Squash Merging
Lucas Seiki Oshiro explains the drawbacks of squash merging in Git, debunking the belief that it condenses changes effectively. He clarifies Git's inner workings and the implications of squash merging.
A Better Merge Workflow with Jujutsu
A new merge workflow using Jujutsu, a modern VCS compatible with Git, introduces The Austin™ Mega Merge Strategy®. It simplifies merge commits, amending commits, and selecting commits efficiently, enhancing collaboration and code review processes with advanced commit graph manipulation.