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.Ĭlicking on the header in the middle pane will switch between the editable merge results and the base file. Use Ctrl+S or the Save 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.į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. You can open search with Ctrl+F or through the menu: Navigate ▶ Search.
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.
#Edit using sublime merge code
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. 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 to show the diff between them.
#Edit using sublime merge full
EDIT USING SUBLIME MERGE FULLįILE AND HUNK HISTORYį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. This will also follow any file moves or renames throughout the repository.
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.
0 kommentar(er)
