Documentation Getting Started with Sublime Merge
Getting started with Sublime Merge is simple. In this guide you’ll be shown all the steps you need to get started.
If you haven’t already downloaded Sublime Merge, visit the download page.
- Cloning an existing repository
- Creating a new repository
- Understanding the interface
- Using the command palette
- Creating a commit
- Fixing and editing commits
- Creating a branch
- Pushing and pulling
- Merging branches
- Resolving merge conflicts
- Adding remotes
- Setting the upstream
- Remote authentication
Cloning an existing repository
The first step when using Git is usually cloning an existing remote repository. This process will create a copy of a remote repository on your local machine so you can begin making changes. Alternatively, if you’re starting a new project, skip to Creating a new repository.
Things you’ll need
- The remote repository URL
Example URL: https://github.com/sublimehq/Packages.git - (Optional) the authentication information for the remote repository
(likely the username and password you use to authenticate with the remote service)
Steps to clone a repository
- Navigate to the clone page via File Clone Repository… .
Sublime Merge automatically opens this page on first run (shown below) - Paste the remote repository URL into the Source URL input
- Set the local repository path using the Destination Path input
This is where the repository will be cloned to - (Optional) Change the name of the local repository using the Repository Name input
This is the name of the repository (stored as a folder on disk) - Select the Clone button
Once the clone has completed, the repository will open automatically in Sublime Merge.
Creating a new repository
If you’re starting a new project, you’ll likely instead want to initialize a new Git repository instead.
Steps to create a new repository
- Open Sublime Merge, and select the New Repository button
- Select the folder you wish to initialize as a Git repository
Once you’ve done this, the new repository will open automatically in Sublime Merge.
Understanding the interface
The Sublime Merge interface consists of two main sections — the Overview and the Details section.
Overview Section
The overview section is designed to show a summary of the repository.
It contains the Locations column, the Commits column, and the Files column — each of which will be described below.
Locations
The Locations column displays all branches, remotes, tags, stashes, and submodules contained in the repository.
Each item can be selected to reveal its location in the commit graph (excluding submodules). Each item also has a context menu which displays common actions.
Commits
The Commits column displays a graph of all commits contained in the repository. The commit graph is drawn as a series of commit summaries connected via coloured lines (indicating the topology of the commits).
Each commit summary contains useful information such as the commit message and author, along with any associated branches. The context menu of a commit summary also contains common actions.
When a commit summary is selected, the details of the selected commit are displayed in the Details section.
Multiple commits can be selected to perform bulk operations such as squashing or dropping commits. If multiple commits are selected, a diff of the first and last commit will also be displayed in the Details section.
Files
The Files column displays a list of all files associated with the current selection.
If no commits are selected, the files list will show all Unmerged , Modified , Untracked , and Staged files.
If a commit is selected, the files list will show all changed files in the selected commit.
Details Section
The details section displays a detailed view of the selected item in the commit graph.
Pending changes
When no commits are selected in the commit graph, the current state of the working directory and index is shown in the details section. From here you can prepare and create new commits.
A diff is displayed for each Unmerged , Modified , Untracked , and Staged file. Each file has an associated tab which can be selected to view the changes to the individual file.
Commit dialog — file tabs
To create a new commit, see Creating a commit.
Commit details
When a commit is selected in the commit graph, the details of the selected commit are shown in the details section.
Commit metadata such as the commit message and author is displayed at the top of this section.
Below the commit metadata is a list of all changed files and their associated diffs (changes).
Using the command palette
The command palette is a quick way to access a vast selection of commands available to you in Sublime Merge.
For example, renaming a branch or navigating to a tag
You can open the command palette via Tools Command palette… or via Ctrl + p ( Cmd + p for MacOS).
The command palette presents a list of commands which can be filtered by typing portions of the command name you’re looking for.
You can also add you’re own custom commands to the command palette. (See customizing the command palette)
Creating a commit
Once you have made changes to any local files in your repository, your changes appear in the Pending changes section.
Modified files appear in the Working Directory section, and new files appear in the Untracked Files section. To commit new changes to the local repository, you’ll first need to stage the changes.
Staging Changes using Sublime Merge
Staging an entire file: select the Stage file button at the top of the file
Staging an entire hunk: select the Stage hunk button at the top of the file
Staging individual lines: select the individual lines you wish to stage and select Stage lines
Reviewing your changes before committing
You can review staged changes by scrolling to the Staged files section of the summary page. Alternatively, you can select each staged file tab to view the file individually.
Committing the staged changes
Begin by entering a commit message using the commit message input located at the top of the screen by default. Once you’ve entered the commit message, select the Commit button.
Commit Message Input
Fixing and editing commits
You may make a new commit, only to realise you’ve made a mistake. Maybe the commit message isn’t quite right, or you forgot to include a file in the commit.
Sublime Merge has first-class support for editing commits to handle these situations.
Editing a commit message
To edit a commits message, simply open the commit context menu and select Edit Commit Edit Commit Message…
You can now begin typing a new commit message in the Details section. Once you are happy with the changes, select Save .
Editing commit contents
Editing the most recent commit
To edit the most recent commit, you can use the amend functionality.
Begin by editing the files you wish to change in your text editor, and then stage the changes using Sublime Merge. Once the changes have been staged, select the dropdown button next to the commit button and select Amend Previous Commit (—amend) .
Git will now combine the staged changes with the previous commit.
Editing older commits
If you want to edit older commits, you can use the Edit Commit Contents functionality.
Locate the commit you want to edit, open the context menu, and select Edit Commit Edit Commit Contents… The selected commit will be undone, and you’ll have a chance to update the commit contents. Once you’re happy with the changes, re-commit them using the Commit button.
Select the Continue rebase button to complete the edit. If you make a mistake and want to abort the edit, select the Abort rebase button.
Note that editing older commits may produce merge conflicts which will need to be resolved. See Resolving merge conflicts.
A note about editing commits
Editing a commit makes an entirely new commit and hides the old commit (due to the way Git works). Additionally, editing a commit locally won’t update any remote commits. If the commit you are editing has already been pushed to the remote repository, proceed with caution.
If this is the case, you’ll need to push the updated commit by performing a push —force-with-lease (available in the advanced push menu). This tells the remote repository to overwrite the remote commits with the updated commits (provided nobody has updated the remote commits in the meantime).
Creating a branch
Creating a new branch via the command palette
Creating a new branch via the commit graph
Creating a local branch from a remote branch
Open the locations bar, and locate the Remotes section. Right click the remote branch and select Create local branch from…
Pushing and pulling
Pushing and pulling is required to share your work with others. This is done by pushing and pulling commits to and from a remote repository.
Push and Pull Buttons
You can perform a basic pushes and pulls using the buttons located in the top-right corner of the interface. For advanced push and pull options, you can select the dropdown button located next to the main button.
Merging branches
Merge via locations bar
- Locate the branches list in the Locations bar
- In the branches list, locate the branch you wish to merge into the currently checked out branch
- Open the context menu for the given branch and select Merge into …
Merge via commit graph
- In the commit graph, locate the branch you wish to merge into the currently checked out branch
- Open the context menu for the given branch and select Merge into …
Merge via command palette
- Open the command palette (see Using the command palette)
- Search for and select Merge branch…
- Locate and select the branch you wish to merge into the currently checked out branch
Resolving merge conflicts
When merging changes to the same file, Git will try to automatically merge the changes. If it can’t do this automatically, it marks the file as unmerged and you will have to manually resolve the merge conflict.
To resolve merge conflicts, you can use the merge tool available with Sublime Merge.
Steps to resolve a merge conflict
Locate the unmerged file in the Pending changes section.
In the unmerged file header, you’ll see the Resolve button which can be selected to open the merge tool.
Merge Tool
The merge tool consists of 3 columns: Ours on the left, Merged in the middle, and Theirs on the right.
Ours and Theirs correspond to the conflicting files, while Merged corresponds to the resulting merged file. Base can also be selected to display the merge base file.
Conflicting changes are displayed with a CONFLICT marker. You can select which conflicting change to accept using the or button located adjacent to the conflicting hunk.
Once all conflicts have been resolved, you can select Save and stage to save the merged file and stage it. Alternatively, you can select Cancel to abandon the changes.
Adding remotes
To push commits to a remote repository, you may need to add a new remote.
Adding remotes via command palette
Open the command palette (see Using the command palette) and select Add Remote… .
You’ll also find Delete Remote… and Rename Remote… commands within the command palette.
Setting the upstream
The upstream branch tells Git which remote branch to associate with a local branch (and is used to indicate where to push new commits).
Setting upstream branch via command palette
- Open the command palette (see Using the command palette) and select Set Branch Upstream…
- Locate the branch you wish to set the upstream for and select it
- Locate the remote branch you wish to set as the upstream and select it
Setting upstream branch via locations bar
- Locate the branches list in the Locations bar
- In the branches list, locate the branch you wish to set the upstream for
- Open the context menu and select Set Upstream…
- Locate the remote branch you wish to set as the upstream and select it
Remote authentication
When making changes to a remote repository, it’s likely you’ll need to provide authentication.
Git supports two connection protocols when accessing a remote repository: HTTPS and SSH . Each of these protocols requires a different type of authentication, outlined below.
Authenticating via HTTPS
When performing an action that requires authentication on a repository using HTTPS connections, an authentication dialog will be displayed. Enter the username and password used to authenticate with the remote repository, then select the OK button.
You may not want to enter your credentials every time you perform a push or pull. In this case, you can use Git’s built-in password manager to cache the credentials for a certain period of time. To do this, open Sublime Merge and navigate to Tools Password Caching . You can request that Git stores the credentials for up to a week.
Note that this is only available on Linux and MacOS. For Windows users, you can use Git Credential Manager for Windows. (See https://github.com/Microsoft/Git-Credential-Manager-for-Windows)
Authenticating via SSH
For SSH authentication, Git will try to use the default ssh key stored at ~/.ssh/ to authenticate. You may be asked to unlock your key, in which case you can enter the passphrase associated with the SSH key to continue.
Persistent storage of SSH credentials depends on the operating system. For most Linux distributions, you can automate unlocking your SSH key on start-up. For MacOS, you can add your SSH credentials to the system keychain. To do this, run ssh-add -K PATH_TO_KEY from the console. For Windows, you can use plink / pageant to connect and store SSH credentials.
Windows: setting up PuTTY / plink / pageant with Sublime Merge
This guide assumes you have existing SSH keys you can import into PuTTY. If not, please read this guide first.
- Begin by downloading and installing PuTTY here
- Once installed, open PuTTYGen and select Conversions Import Key .
- Select your existing RSA key (likely found at ~/.ssh/id_rsa.pub)
- Once imported, save a copy of the private key to the same folder
Now that the key is saved, you can enable plink/PuTTY in Sublime Merge via the preferences.
- Open Sublime Merge and select Preferences Preferences…
- Navigate to Advanced in the preferences dialog.
- Navigate to SSH Path, and set this to the plink system path (likely C:\Program Files (x86)\PuTTY\plink.exe).
Now that Sublime Merge is using plink, the last optional step is to start pageant and load in your credentials. This ensures you don’t have to enter your SSH credentials every time you perform a remote operation.
- Start the pageant executable
- Once started, you’ll find the pageant icon in the system tray. Right click the icon and select Add Key .
- Navigate to and select the private key you saved earlier
Создатели Sublime Text представили Git-клиент Sublime Merge
Sublime Merge распространяется бесплатно для Windows, Linux и macOS. Кроме того, существует платная версия — 99 $ и три года гарантированного обслуживания.
Разработчики из Sublime HQ рассказали в своем блоге о новом проекте — клиенте системы контроля версий под названием Sublime Merge. Он сочетает в себе знакомый интерфейс редактора кода и функции Git, например: возможность контролировать слияние версий, искать выбранные коммиты или просматривать историю изменений.
Авторы клиента утверждают, что используют собственное воплощение системы, которое эффективно расходует ресурсы приложения, но при изменении репозиториев обращается к «официальному» Git.
Что еще интересного в Sublime Merge?
- возможность выбора между темной и светлой темами (только в платной версии);
- интегрированный инструмент слияния;
- сравнение фрагментов кода для устранения конфликтов перед слиянием;
- встроенный инструмент командной строки;
- подсветка синтаксиса;
- поддержка пользовательских хоткеев, сочетаний клавиш и кастомных тем с возможностью настройки в JSON-файлах;
- продвинутый инструмент анализа истории изменений Blame, с помощью которого можно просмотреть все коммиты для каждой строки кода с подробным описанием, именем автора и временем пуша.
Клиент распространяется бесплатно для Windows, Linux и macOS. Кроме того, существует платная версия — 99 $, три года гарантированного обслуживания и возможность сменить тему на темную. Подробнее почитать и загрузить Sublime Merge можно на официальном сайте, однако разработчики предупреждают, что приложение пока «сырое» и могут наблюдаться баги.
В мае 2018 года вышло обновление редактора кода Sublime Text до версии 3.1. Среди нововведений — улучшения в UI, отображении текста и цветовых схем, а также поддержка синтаксиса для Git-файлов.
A1.6 Приложение A: Git в других окружениях — Git в Sublime Text
Начиная с версии 3.2 в редактор Sublime Text встроена поддержка Git.
- На боковой панели git статус файлов и каталогов помечается бэйджем/иконкой.
- Файлы и каталоги, указанные в .gitignore не отображаются на боковой панели.
- В строке состояния отображается текущая ветка и количество внесённых изменений.
- Изменённые строки помечаются маркерами в канавке с нумерацией.
- Можно использовать некоторые функции git клиента Sublime Merge непосредственно из Sublime Text. (Это требует установки Sublime Merge: https://www.sublimemerge.com/)
Sublime Merge
Sublime Merge — это git-клиент, он быстрый и интуитивно понятный. Он способен сравнивать отрезки кода перед слиянием, дабы избежать конфликтов между фрагментами от разных разработчиков. Помимо этого, приложение умеет качественно анализировать историю изменения Blame. В него добавлены: подсветка синтаксиса, инструмент слияния и командной строки, возможность настроить горячие клавиши.
Сколько стоит купить лицензию, варианты поставки
Sublime Merge 1 user license annual subscription
Экземпляр программы для ЭВМ Sublime Merge 1 user license annual subscription
- Артикул: SUB-MER-1-S
- Тип поставки: Электронная (e-mail)
- Язык (версия): Английский
- Срок поставки лицензионной программы или ключа активации:
3-14 рабочих дней ? - Примечания: Временная лицензия на 1 год.
- Платформа: Windows/Mac OS/Linux
- Тип лицензии: Временная
- Срок действия лицензии: 12 мес.
- Тип покупателя: Коммерческая
- Оплата картой недоступна
- Только для юр. лиц и ИП