A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more.
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 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 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.
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.
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 Enter to stage/unstage hunks. When writing a commit message, use Ctrl+Enter to commit.
The Command Palette is triggered by Ctrl+P and allows quick access to a large set of Git commands as well as other Sublime Merge functionality.
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.
This is a multi-package portable. I can add updates/plugins via .svm files, just request plugins or notify me about new updates.
- Sublime Merge Portable.exe = main program and data file
Sandbox folder: "\Sandbox\Sublime Merge\roaming\modified\@[email protected]\Sublime Merge\"
- No installation required
- No Admin rights needed
- 100% Offline, completely safe to use, no firewall needed
- Sandbox folder containing modified settings, delete to reset
- Just run it and enjoy!
|Version||Format||Size ?||Download ?|
22.214.171.124 (Build 1116)
126.96.36.199 (Build 1116)
Click 'Thank You' to let me know if this program is important to you! It might get more updates 😎
And if the portable works for you, remember to come back and leave a positive comment! 💖
No files are hosted or transmitted by this server. No copyright infringement or violation of intellectual property intended. All the content reported in this post is just a copy-paste of what can be easily found on the original website of the original software maker, that is the one found by clicking on 'Read more'. That website and the relative company owns any intellectual property here included.
By continuing with any file download, the user agrees to have read and understood the Disclaimer page and to be okay with it - as also stated in the cookie bar at the bottom of every page - agreeing to delete any file downloaded from this post within 24 hours from the first run, as it's intended to be for evaluation purposes only, no different from the official Trial given by the owner, but just in an easy 1-click format without installation hassles.