Skip to content

Handle server sync conflicts with explicit resolution actions#385

Open
avinxshKD wants to merge 1 commit intoControlCore-Project:devfrom
avinxshKD:fix/server-sync-conflict-flow
Open

Handle server sync conflicts with explicit resolution actions#385
avinxshKD wants to merge 1 commit intoControlCore-Project:devfrom
avinxshKD:fix/server-sync-conflict-flow

Conversation

@avinxshKD
Copy link
Copy Markdown

@avinxshKD avinxshKD commented Apr 8, 2026

Stop silent sync failures when local/remote history diverges.
On conflict, show one modal with clear choices: pull remote, force push local, open remote in new tab, or cancel.
Also surfaces local/remote hash context so the decision is informed.

closes #384

@avinxshKD
Copy link
Copy Markdown
Author

Hey @pradeeban pls take a look, sync conflicts are now visible with clear recovery options instead of failing silently.

@avinxshKD
Copy link
Copy Markdown
Author

Also, I’d like to work on a full sync-state layer with a dedicated status panel (local/remote hash, last sync result, and one-click resolve actions), so conflict handling is explicit and reliable end-to-end instead of message-dependent. What do you think?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant