Sep 20, 2018 Individual purchases are buy once, use forever, with 3 years of updates included in the purchase. Business licenses are available on a subscription basis. Sublime Merge runs on Windows, Mac and Linux. It's still early days for Sublime Merge - it has only been used by us and our small team of beta testers so far. We'd love to hear what you think. Sublime Merge is a full-featured, blazing-fast Git client built upon the technologies from Sublime Text. Since editing source code and prose requires different tools and workflows than managing a Git repository, we opted to integrate the most appropriate Git functionality into Sublime Text, but leave more advanced features in Sublime Merge. Education Discounts. Educational discounts are not presently offered. Personal licenses come with 3 years of updates. After 3 years, you'll be able to continue to use the last version of Sublime Merge released within 3 years of purchase (in other words, licenses do not expire).
If you have at least one file open in Sublime Text, press [ctrl]+[alt]+[d] to view list of available commands for current file. The same commands (except the ones defined in Custom Comparisons) appears in Command Palette and Context Menus.
This chapter describes all commands that may be available after pressing [ctrl]+[alt]+[d].
Allows to compare current view with another. After selecting this command you will get a list of all other comparable views from current window.
Please remember that if you want to compare two files, you can also select them in Side Bar and then use Sublimerge > Compare Selected Files command.
This command appears if there is at least one snapshot of current view that differs from current view's state. After selecting this command you will get the list of available snapshots to compare with current view.
This command appears when clipboard contents can be used to compare with current view. After selecting this command current view will be compared to clipboard contents.
Use this command to quickly spot differences between two selected blocks of text. This command appears when you perform two non-empty selections in current view.
With this command you can quickly spot differences between single non-empty selections from multiple views. It appears when current view, and at least one another comparable view, contains single non-empty selection. When you run this command, you will get a list of views which can be compared to current view.
This command is available when current view is created from a file (file path is known) and is in dirty state. Running this command will show diff between current state and last saved state. With this command you can selectively revert unsaved changes.
When you have exactly two Focus Groups in your window, this command allows to quickly compare their active views.
If you use Git, Subversion or Mercurial, Sublimerge will greatly improve your workflow. It will automatically discover versioned files and the VCS system to use. Then it will let you compare (and merge) your working copy with revisions, branches, tags or even see what changes are not commited/pushed. Thanks to Custom Comparisons engine, the number of custom workflows is limited only by your imagination.
To complete your workflow, you can setup Sublimerge as a diff viewer and merge tool not only for Git, Subversion and Mercurial, but probably for anything else. Please take a look at VCS integration for more information about VCS support.
Use this command to compare file in current view to its any revision. Running this command displays VCS history of the file in view so that you can easily select interesting revision. It may take a while for history to be retrieved.
Git and Mercurial only. Compares file in current view with the same file in another branch. Running this command displays list of branches allowing you to select the interesting one. For Git it is called Compare to Other Branch..., for Mercurial Compare to Named Branch....
Use this command to compare two different revisions of file from current view. Running this command displays two commits history lists allowing you to select interesting revisions. It may take a while for history to be retrieved.
Git only. Compares current HEAD to selected remote. Running this command displays list of available remotes allowing you to select the interesting one. After selecting remote it will display list of files that are different. Selecting one runs diff.
This command works the same as Compare Revision to Revision... except that it compares selected revision with previous one (if exists).
Displays list of files that are modified and not yet commited. Allows you to select interesting one to show differences and selectively revert changes.
Git only. Displays list of files that were commited to remote-tracking branch, but not yet pushed to a remote.
Snapshots can be used to temporarily store important changes. This is handy when you are working on some feature and, for instance, want to compare performance of a number of possible solutions. Instead saving the changes to another file or having them stored in clipboard, you can create a snapshot which will be stored in memory until the view is closed or you decide to delete it.
All snapshot-related commands are accessible from view's context menu, tab's context menu and file's context menu. They are not configured to use keyboard shortcuts, but you can do it by yourself.
From context menu select Create Snapshot... command. In the input box appearing on the bottom type a descriptive snapshot name and press [Enter].
From context menu select Revert to Snapshot... command. From the appearing list select the snapshot and hit [Enter].
From context menu select Replace Snapshot... command. From the appearing list select the snapshot you want to replace and hit [Enter].
From context menu select Remove Snapshot... command. From the appearing list select the snapshot you want to remove and hit [Enter].
With Sublimerge you can browse, compare and apply changes between directories without leaving Sublime Text.
To do so, simply select (exactly) two directories in Side Bar. Then, from context menu, choose Sublimerge > Compare Selected Directories. Depending on directories size it may take a while for diff window to show up. For navigation please take a look at Configuration/Key Bindings/In directories diff view.