Orca is the next-gen IDE for building with coding agents
Find a file
Jinjing 333023fb67
feat: show merge conflicts in source control sidebar (#204)
* Squashed commits

- refactor

- commit design doc

* docs: add why-comments to conflict resolution code and track conflicts on open

- Add explanatory comments throughout conflict resolution code covering
  safety constraints, architectural boundaries, and compatibility choices
- Track unresolved conflicts in openConflictFile so Resolved locally
  state works for conflict-safe entry point
- Add CLAUDE.md/AGENTS.md guideline for documenting the "why"
- Add test for conflict tracking through openConflictFile
2026-03-29 15:40:23 -07:00
.agents/skills fix: prevent app crash on macOS reactivation by deduplicating IPC handlers (#81) 2026-03-23 23:44:12 -07:00
.claude/skills feat: extract file explorer entry filter logic (#200) 2026-03-29 13:16:43 -07:00
.github docs: add contribution guide and PR template (#163) 2026-03-28 10:44:02 -07:00
.husky Replace eslint/prettier with oxlint/oxfmt, add pre-commit hooks 2026-03-16 20:38:27 -07:00
build Fix Windows build: generate proper ICO file instead of renamed PNG 2026-03-21 15:16:34 -07:00
docs feat: show merge conflicts in source control sidebar (#204) 2026-03-29 15:40:23 -07:00
icon Fix Windows build: generate proper ICO file instead of renamed PNG 2026-03-21 15:16:34 -07:00
resources terminal improvements 2026-03-21 13:18:13 -07:00
src feat: show merge conflicts in source control sidebar (#204) 2026-03-29 15:40:23 -07:00
.editorconfig Initial commit 2026-03-16 20:29:24 -07:00
.gitignore fix: handle orphaned worktree deletion with disk cleanup (#109) 2026-03-25 23:14:48 -07:00
.npmrc remove npmmirror.com mirrors (missing arm64 dmg builder binary) 2026-03-19 01:52:53 -07:00
.oxfmtrc.json Replace eslint/prettier with oxlint/oxfmt, add pre-commit hooks 2026-03-16 20:38:27 -07:00
.oxlintrc.json Lint long files (and add TS skills) (#23) 2026-03-22 12:12:54 -07:00
AGENTS.md feat: show merge conflicts in source control sidebar (#204) 2026-03-29 15:40:23 -07:00
CLAUDE.md feat: show merge conflicts in source control sidebar (#204) 2026-03-29 15:40:23 -07:00
components.json Shadcn 2026-03-16 22:27:51 -07:00
CONTRIBUTING.md docs: add contribution guide and PR template (#163) 2026-03-28 10:44:02 -07:00
dev-app-update.yml code release stuff 2026-03-19 00:36:36 -07:00
electron-builder.yml Publish stable GitHub release asset names (#174) 2026-03-28 14:07:25 -07:00
electron.vite.config.ts fix: extract path-security helpers, add tests, and improve type safety (#102) 2026-03-25 09:59:19 -07:00
file-drag.gif Update README screenshot to file-drag gif (#152) 2026-03-27 23:42:47 -07:00
LICENSE Add MIT license 2026-03-28 10:19:14 -07:00
package.json 1.0.62 2026-03-29 00:29:45 -07:00
pnpm-lock.yaml WIP: uncommitted changes before rebase (#168) 2026-03-28 11:59:55 -07:00
README.md docs(readme): fix Shipped to Shipping daily (#202) 2026-03-29 13:28:21 -07:00
screenshot.png Add application screenshot to README (#12) 2026-03-21 17:09:18 -07:00
skills-lock.json Lint long files (and add TS skills) (#23) 2026-03-22 12:12:54 -07:00
tsconfig.json Shadcn 2026-03-16 22:27:51 -07:00
tsconfig.node.json Major features 2026-03-17 01:40:24 -07:00
tsconfig.web.json Major features 2026-03-17 01:40:24 -07:00
vitest.config.ts Add PR checks workflow and Vitest coverage (#97) 2026-03-24 20:53:38 -07:00

Orca

Orca

A cross-platform AI Orchestrator for 100x engineers.
Seamlessly manage multiple worktrees and open multiple terminals running anything — Claude Code, Codex, OpenCode, and more.
Built-in status tracking, notifications, and unread markers. Makes coding multiple features across multiple repos a breeze.

Learn more at www.OrcaBuild.ai

Orca Screenshot


Shipping daily

Missing something? It's probably landing tomorrow. Request a feature · Star to follow along.


Features

  • Manage multiple worktrees
  • Multiple terminals, tabs and panes
  • Get worktree notifications (plus ability to manually mark threads as unread -- similar to Gmail )
  • See which worktrees have working agents
  • GitHub integrations for GH PRs (automatic), ability to link GH issues (via gh cli), and a GH checks viewer
  • File editor, search, source control tab (see worktree changes, make edits, easily commit)

Install

Grab a release from https://www.orcabuild.ai/ or download from the GH release page

Developing

See CONTRIBUTING.md for branch naming, PR expectations, and required checks.

Install

$ pnpm install

Development

$ pnpm dev

Build

# For windows
$ pnpm build:win

# For macOS
$ pnpm build:mac

# For Linux
$ pnpm build:linux