Skip to content
All docs
Version control

Git integration

A first-class Git client, with the agent one keystroke away.

Arshas includes the full Git experience you expect — stage, commit, branch, stash, blame, and a graph view — plus AI assistance woven into each step.

Everyday flow

The Source Control view shows your working tree with inline diffs. Stage hunks with a click, write or generate a commit message, and push — nothing new to learn. Blame annotations and file history are one hover away in the gutter.

Where Arshas goes further is context: the agent reads your uncommitted diff, so you can ask “is anything in this change risky?” or “split this into two logical commits” and get an actionable answer.

Merge conflicts

When a merge or rebase hits conflicts, the conflict editor shows both sides with an AI-proposed resolution for each conflict block, with its reasoning attached. Accept, edit, or resolve manually — the proposal is a starting point, never an auto-merge.