8/18/2023 0 Comments Sublime merge resolve conflict![]() ![]() 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. 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.į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. 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.Ĭhoose between a light and a dark theme to suit your tastes. Open the Preferences ▶ Preferences… menu to change theme. The dark theme is only available with a valid license key. Just like Sublime Text, just about everything in Sublime Merge is extensible. Sublime Merge performs full syntax highlighting identically to Sublime Text for every line of code you see.We’ll even use any extra syntax definitions that we find in your Sublime Text installation for syntax highlighting! Key bindings, menus, theming, and the command palette are all customizable with simple JSON files. 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. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |