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.
0 kommentar(er)
