Skip to content

docs(plugins.development): keep sync-code running while resolving conflicts#19

Merged
datbth merged 2 commits into
mainfrom
sync-code-update
Jun 15, 2026
Merged

docs(plugins.development): keep sync-code running while resolving conflicts#19
datbth merged 2 commits into
mainfrom
sync-code-update

Conversation

@khaito241

Copy link
Copy Markdown
Contributor

What

Add a guidance bullet to the setup-amql-development skill: when markers), resolve them in place and keep the sync running, don't stop it to resolve and restart.

Why

Conflicts during sync are a normal part of reconciling local and cloud code. The observed bad pattern was the agent treating a conflict as an error: stopping sync-code, resolving the markers, then restarting it.

That's wrong because:

  • Stopping and restarting re-compares cloud vs local, finds them divergent again, and re-triggers the same conflict -> an endless loop.
  • A running sync pushes the local resolution up to cloud, which is what actually settles the conflict.

Keeping the sync running lets the local fix propagate and resolve cleanly.

Changes

  • plugins/holistics-development/skills/setup-amql-development/SKILL.md -> one sub-bullet under the sync-code --background usage line.

@khaito241 khaito241 requested a review from datbth as a code owner June 15, 2026 11:30
@datbth datbth force-pushed the sync-code-update branch from 6b4fc42 to e1cfa42 Compare June 15, 2026 11:45
@datbth datbth merged commit f7509ff into main Jun 15, 2026
3 checks passed
@datbth datbth deleted the sync-code-update branch June 15, 2026 11:48
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.

2 participants