docs: no-force-push results sync behavior (av-raf)#1509
Merged
Conversation
The conflict-free results sync (epic av-raf) replaced the force-push push conflict path with an auto-merge loop plus a human GitHub-merge fallback, but the public docs still described `backup_and_force_push` as creating a backup ref and force-pushing. Update results.mdx and dashboard.mdx to state that non-fast-forward pushes auto-merge with artifact-aware drivers and push as a fast-forward (never force), that `backup_and_force_push` is deprecated and no longer force-pushes, and that genuine overlay conflicts surface a Pending merge card with a GitHub compare link + "I merged it — resync". Add needs-human-merge to the documented sync statuses. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Deploying agentv with
|
| Latest commit: |
65e5228
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://920590cb.agentv.pages.dev |
| Branch Preview URL: | https://docs-av-raf-no-force-push-do.agentv.pages.dev |
The implementation plan was a temporary working artifact (per .agents/workflow.md, plans are deleted once their details land in official docs). Now that all phases (av-raf) are merged, distill the durable decision into a proper ADR and remove the plan doc. Repoint the results-repo.ts comment at the ADR. - add docs/adr/2026-06-24-no-force-push-results-sync.md (Status: Accepted) - remove docs/plans/2026-06-24-001-feat-conflict-free-results-sync-plan.md - results-repo.ts: update the plan-doc reference to the ADR path Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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
1 participant
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.
Docs accuracy follow-up for the no-force-push results sync epic (av-raf)
Phases 0–3 (#1506, #1507, #1508) replaced the force-push results-sync path with an auto-merge loop plus a human GitHub-merge fallback. The public docs still described
backup_and_force_pushas creating a backup ref and force-pushing the canonical branch, which is now factually wrong.Changes
index.jsonl, JSON-union for tag/feedback overlays) and push as a fast-forward; genuine conflicts route to a timestampedagentv/results-sync/...branch + GitHub compare/PR link.backup_and_force_pushis documented as deprecated and no longer force-pushing.needs human mergeto the listed sync statuses.Docs-only; no code changes. The link checker only globs
**/*.mdand no links were added.Part of epic av-raf.