Editor & workspace
Source control
A guided Git workflow for first-time contributors and experienced developers.
Everyday workflow
Review changes, stage intentionally, commit, pull, and push from one panel. Kashira translates common Git errors into short explanations and relevant recovery actions.
Branches and upstreams
Create or switch branches, select a remote tracking branch, set or change upstream, and publish a new branch. The panel detects a missing first commit before attempting to set an upstream.
Merge conflicts
When Git reports a merge conflict, open the conflict view from Source Control. Compare your changes with incoming changes, choose the parts to keep, then mark the file resolved before continuing the merge.