Documentation
Git Sync
Stay oriented relative to your remote with branch lists, ahead/behind status, a collaboration feed, and an interactive conflict resolver.
Branches and status
- Lists local and remote-tracking branches after clone
- Remote-only branches can be checked out as tracking branches (
checkout -b … --track) - Shows commits ahead and behind upstream for each branch
- Collaboration feed tags each commit with every branch that contains it
Fetch, pull, and push
Remote actions run through the dashboard against the system git binary. When a pull is not a fast-forward, OmniSync surfaces a divergence choice:
- Pull merge · merge remote changes into your branch
- Pull rebase · rebase your commits onto the remote tip
Staging and commits
Use the changes panel to stage, unstage, and commit. Commits and pushes to protected branches are blocked when branch protection is enabled (default for main / master, plus any custom list).
Conflict resolver
OmniSync scans for merge conflict markers (<<<<<<<). When conflicts are found, Git Sync opens a three-pane resolver:
- Current (yours) on the left
- Incoming (theirs) on the right
- Result in the center: accept blocks individually to build the resolved file
After resolving, continue the merge or rebase from the same view.
Branch merge
Preview and merge branches from the Git Sync UI when you need to bring work together without leaving the dashboard.
Auth failures
If GitHub authentication fails during remote operations, re-sign in from Setup. Tokens are stored encrypted via the OS keychain · see Security.