Clicking on the header in the middle pane will switch between the editable merge results and the base file. The same text editing functionality as Sublime Text is also available for more complicated merges. 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. Conflicts are presented with a 3-pane view. 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. 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. Requirements: OS X 10.9 or later 64-bit Sublime Merge 1.0.0.Sublime Merge 2 Build 2059 (圆4) | 28.6 Mb You can also hover over most buttons to see which git command it will run. When you’re working with Sublime Merge, you’re working with Real Git, not a simplified version Sublime Merge uses the same terminology as Git, and doesn’t make use of any state beyond Git itself. We’ll even use any extra syntax definitions that we find in your Sublime Text installation for syntax highlighting!
Stage hunk sublime merge full#
Sublime Merge performs full syntax highlighting identically to Sublime Text for every line of code you see. This will also follow any file moves or renames throughout the repository. 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.įrom any file or hunk in the history use …File History or the Hunk History button to view the full history of that source code. Click a line in the gutter to highlight all other lines from the same commit. 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.Įasily 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. Use find-as-you-type search to dig up the exact commit you’re looking for. 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. Use the terminal where it makes sense and use the GUI where it works best. 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. Sublime Merge is designed to work hand in hand with the command line. Key bindings, menus, theming, and the command palette are all customizable with simple JSON files. Just like Sublime Text, just about everything in Sublime Merge is extensible. 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. When writing a commit message, use Ctrl+Enter to commit. Use Tab to navigate through parts of the application, Space to toggle expansion, and Enter to stage/unstage hunks. This includes when you rename or move a file, when you’re resolving conflicts or just viewing commit history. Where it makes sense we will show you exactly which individual characters have been changed for a commit. 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. Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. 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.
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.
0 kommentar(er)
