[1bye]

Change

When local and upstream branches diverge, Sync opens a populated incoming/outgoing review. Merge and Rebase use compact header confirmation popovers and return to Changes after integration; pushing stays separate.

Conflict review groups unresolved files and compares either indexed source with the working result in an aligned, highlighted split diff with expandable context. Whole-file replacement remains explicit and rejects an indexed version changed since review. Existing tree navigation is preserved.

Verification

• 71 focused native/component/unit tests passed, including sync, conflict, comparison, tree navigation and file labels.
• 10 real-Git conflict integration tests passed.
• Workspace types, lint, formatting and changeset status passed.
• Native addon rebuilt and the restored app opened with a conflicted test repository.
• Native layouts checked in light/dark appearance and at the minimum window size.
• Release note: .changeset/silver-toys-swim.md (@1git/gpuix minor, @1git/git patch).