docs(plugins.development): keep sync-code running while resolving conflicts#19
Merged
Conversation
datbth
approved these changes
Jun 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Add a guidance bullet to the
setup-amql-developmentskill: 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:
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 thesync-code --backgroundusage line.