orca/mobile/scripts at 16347ab7993d98cffdd8b1be11e0cbb2b6da6d01 - orca

mirror of https://github.com/stablyai/orca.git synced 2026-09-21 16:02:20 +00:00

Files

T

Jinjing 16347ab799 Handle clean local merges when hosting provider reports conflicts (#5942 )

When the hosting provider (GitHub) reports conflicts but a local merge
simulation is clean, we now mark the conflict summary as locally clean.

This state is surfaced in both the desktop and mobile sidebars with a
clear explanation and a copyable set of commands to trigger a remote
mergeability recalculation via an empty commit and push.

2026-06-20 17:08:58 -07:00

mobile-lag-scenario.ts

Handle clean local merges when hosting provider reports conflicts (#5942 )

2026-06-20 17:08:58 -07:00

mock-server-encryption.ts

Mobile: worktree-list sidebar for tablet/foldable layouts (#5505 )

2026-06-16 16:50:38 -07:00

mock-server-git-state.ts

feat(mobile): combine PR sidebar and checks parity (#5641 )

2026-06-17 22:52:12 -07:00

mock-server-rpc-handlers.ts

feat(mobile): combine PR sidebar and checks parity (#5641 )