Skip to content

feat(desktop): add first-class conflict screen - #497

Merged
tomymaritano merged 2 commits into
developfrom
feat/conflict-ui
Aug 19, 2026
Merged

feat(desktop): add first-class conflict screen#497
tomymaritano merged 2 commits into
developfrom
feat/conflict-ui

fix(desktop): restore local body on keep-this-device

81a5ac8
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar