#Theme sublime merge full

Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. You can open search with Ctrl+F or through the menu: Navigate ▶ Search. Complex search queries can be constructed using and, or and () symbols.įor example min-parents:2 author:jskinner path:tests/* (bug fix or test) will search for a merge commit from jskinner inside the tests directory that contain the words 'bug' and 'fix' or the word 'test'. Search for commit messages, commit authors, file names, and wildcard patterns. Use find-as-you-type search to dig up the exact commit you're looking for. Use Ctrl+S or the Save button to save your merged file. The same text editing functionality as Sublime Text is also available for more complicated merges.Ĭlicking on the header in the middle pane will switch between the editable merge results and the base file. In the center pane is the resolved text, with buttons to choose between your changes or theirs. On the left are your changes and on the right are theirs. The Integrated Merge Tool allows you to resolve any merge conflicts directly in Sublime Merge, rather than having to open up your editor of choice.Ĭonflicts are presented with a 3-pane view. Stage Files, Hunks and Lines with no waiting - Sublime Merge is really, really fast. A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. Meet a new Git Client, from the makers of Sublime Text.

It boasts some of the best highlighting and diff engines out there, making merging commits and resolving conflicts feel like a walk in the park.Git Client, done Sublime. It's a well-designed app that has looks and feels like a modern Git GUI should. ConclusionĪll in all, Sublime Merge doesn't fall short in any meaningful aspect.

You can change the sidebar layout, the commit creation message position, the text diff style, the word wrap settings, as well as the whitespace visibility, and many many other things.

#Theme sublime merge full

You have full control over the app's general behavior, as well as layout, commit messages, and the useful diff tools.įor example, you can choose between two looks for the GUI (dark and light), change the font face, size, and tab size, as well as tweak aspects regarding tab translation and merge commit display options. Customization is something that has not been overlooked by the dev teamĪs expected from an app of this sort, Sublime Merge is very well equipped in the customization department.

Other noteworthy highlights include the selection of merge tools that allow you to resolve merge conflicts in mere seconds, a command palette, a submodule manager, command line integration, as well as Git Flow integration. You can search over the whole repository, and perform complex searches by commit message, author, path, and various other contents. Of course, its syntax highlighting engine helps a lot, but this is also possible thanks to nifty features such as a side by side difference and character diff.Īnother great aspect of Sublime merge is, of course, its powerful find-as-you-type search function. Reviewing changes between commits is also a breeze. With its help, you can commit faster by staging files, hunks, and lines almost instantly. It has well over 40 supported languages, and it even boasts an automatic loading system for third-party syntaxes. Some of its most notable advantages include a very fast and precise highlighting engine, as well as a custom, performance-oriented Git reading library. Here's why Sublime Merge is worth your attentionĮven though it boasts a very user-friendly GUI, Sublime Merge has a lot going for it. The app's main purpose is to help power users work faster and more efficiently with Git. Sublime Merge is a new generation, feature-packed, and flexible Git client.