Use source control

The Source Control tab of the right panel shows the project’s Git repository. A dot on the tab means there are uncommitted changes. In the sidebar, each project shows its branch, a ● for uncommitted changes, and ↑/↓ counts for commits to push and pull.

Dockmaster uses the git installed on your computer. If the project folder isn’t a repository yet, click Initialize repository.

Review and stage changes

Changed files are grouped under Staged changes, Changes and Untracked, each with its added and removed line counts.

• Hover a file for its actions: Stage (+), Unstage (−), Discard changes, and Open file.
• Hover a section header to stage, unstage or discard the whole group.
• Click a file to open it in your editor, where you can see the diff. Dockmaster doesn’t show diffs itself.

Discarding asks first and can’t be undone. It also deletes untracked files.

Commit

1. Stage the changes you want to commit.
2. Type a message in the box at the top.
3. Click Commit, or press Ctrl+Enter (Cmd+Enter on macOS).

The arrow next to Commit offers Commit & Push and Commit (Amend).

Branches and syncing

• Click the branch name to switch to a local or remote branch, or type a name and click Create to start a new one.
• Fetch (the refresh icon) gets the latest from all remotes.
• Sync (the cloud icon) pulls with rebase if you’re behind, then pushes. On a branch that isn’t on the remote yet, it publishes the branch.

If a pull stops on conflicts, a banner lists them. Resolve them in your editor, mark each file resolved with its ✓ button, then click Continue, or click Abort to undo the rebase.

Projects with several repositories

If a project’s apps live in different repositories, for example a separate backend and frontend, a repository picker appears in the toolbar. Everything in the panel applies to the selected repository.

Signing in to your remote

Dockmaster never asks for or stores your Git password. Pushing and pulling use your existing Git credential helper or SSH agent. If a push fails with an authentication error, sign in once from a terminal (for example with git push), then try again.