Integrated Merge Tool
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.
Conflicts are presented with a 3-pane view. On the left are your changes and on the right are theirs. In the center pane is the resolved text, with buttons to choose between your changes or theirs. The same text editing functionality as Sublime Text is also available for more complicated merges.
Clicking on the header in the middle pane will switch between the editable merge results and the base file.
Use Ctrl+S⌘+S or the button to save your merged file.
Use find-as-you-type search to dig up the exact commit you're looking for.
Search for commit messages, commit authors, file names, and wildcard patterns. Complex search queries can be constructed using and, or and () symbols.
For 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".
You can open search with Ctrl+F⌘+F or through the menu: .
Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. With a powerful, cross-platform UI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance.
Open the Blame of a file through the Command Palette or when viewing a commit to see exactly which lines of the file were added by which commits.
Easily view the age, author, and commit hash of every line of code and see which lines come from the same commit with our commit color coding. Click a line in the gutter to highlight all other lines from the same commit.
The blame tool will also detect when a piece of code was moved from another place in your repository, so you can truly follow the history of your code.
Where it makes sense we will show you exactly which individual characters have been changed for a commit.
This includes when you rename or move a file, when you're resolving conflicts or just viewing commit history.
Select any two commits in Sublime Merge with Ctrl+Left Mouse⌘+Left Mouse to show the diff between them.
File and Hunk History
From any file or hunk in the history useor the button to view the full history of that source code. This will also follow any file moves or renames throughout the repository.
Command Palette and Key Bindings
Keyboard usage is important to us. Use Tab to navigate through parts of the application, Space to toggle expansion, and EnterReturn to stage/unstage hunks. When writing a commit message, use Ctrl+Enter⌘+Return to commit.
The Command Palette is triggered by Ctrl+P⌘+P and allows quick access to a large set of Git commands as well as other Sublime Merge functionality.
Light and Dark Themes
Choose between a light and a dark theme to suit your tastes. You can preview these themes above.
Open themenu to change theme.
The dark theme is only available with a valid license key.
Just like Sublime Text, just about everything in Sublime Merge is extensible. Key bindings, menus, theming, and the command palette are all customizable with simple JSON files.
Sublime Merge performs full syntax highlighting identically to Sublime Text for every line of code you see.
We'll even use any extra syntax definitions that we find in your Sublime Text installation for syntax highlighting!
Command Line Integration
Sublime Merge is designed to work hand in hand with the command line. All changes to the repository are updated live and everything works the same way whether it's triggered from the command line or the UI. Use the terminal where it makes sense and use the GUI where it works best.
Use the smerge tool that comes with Sublime Merge to interact with it from the command line: open repositories, blame files or search for commits
Sublime Merge uses the same terminology as Git, and doesn't make use of any state beyond Git itself. When you're working with Sublime Merge, you're working with Real Git, not a simplified version
You can also hover over most buttons to see which git command it will run.