You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
🐛 - Branch sync reports a generic workflow failure after detecting merge conflicts #911
The Action published a branch-sync notice inviting the maintainer to run /copilot sync-branch and stating that the configured fixer can resolve eligible conflicts. The command detected conflicts but returned the generic retryable workflow.failed message. The job did not show an invoked conflict-resolution agent or identify which path, policy, or failure prevented resolution. The remote branch remained at the original head.
Expected behavior: resolve eligible conflicts and verify the candidate, or report the concrete reason conflict resolution cannot proceed and the supported next step. Keep branch ownership, protected paths and verification intact.
Reproducing the issue
Use Domus #23 and PR #29. The admitted ref is feature/23-complete-relative-recurrence-lifecycle-and-protected-calendar-after-the-execution-checkpoint, at 8c0a36c0b9804bdaf33a301a4dc85ae3dc12ee21. Its parent develop is at 5b7bdcdee3a9e98d6669bfd34ce750ae30a8c775.
Inspect the job and reply. The job reports ten conflicted paths, including a CI workflow and frontend composition, then exits with no verified candidate or push.
copilot Version
8246440d6d9158f6d6b75231b081e612ed76a789, as recorded by the hosted job.
Relevant Log Output
Active agent roles: fixer=codex/openai/gpt-6-luna.
CONFLICT (content): Merge conflict in .github/workflows/ci_check.yml
CONFLICT (content): Merge conflict in frontend/src/composition/entry-page.ts
Automatic merge failed; fix conflicts and then commit the result.
Error code: workflow.failed
Reference: a4bdd5cb-92bc-4eab-b829-b5b5a708700f
Additional context and comments
The conflict itself is expected. The observed problem is the lack of an eligible-resolution result or an actionable refusal. The presence of a workflow path does not establish why the Action stopped. This is separate from the progress verification rejection tracked in #910.
Hi! I’m @vypbot, the Copilot assistant for this repository.
I can answer questions, explain the codebase, propose implementation and test plans, review issues and pull requests for potential bugs or security problems, and help authorized maintainers apply changes.
Try /copilot help to see the available commands, or mention @vypbot with your question.
Resolved by PR #938, merged into develop at 5bee5ef58daebdfa8288bd757763850bc5494a46, preserving exact accepted head 0efaba9412a4b07f49706154cb28942db00d52c9.
The original ten-path conflict set includes a protected CI workflow. The policy correctly refuses that set before invoking the fixer; the missing reason and generic retryable presentation were the defect. Protected-path and over-limit refusals now expose closed, nonretryable diagnostics (branch-sync-sensitive-paths / branch-sync-conflict-limit), safe counts and complete supported recovery actions in English and Spanish.
Eight focused regressions preserve the protected-path policy, existing 20-conflict ceiling, disabled-agent/missing-configuration precedence, dry run, abort, head checks and branch ownership. Eligible resolution/verification behavior is unchanged. The related generated-artifact fix forces two-sided checked-in bundle/declaration updates into explicit conflicts, and the GitHub Action successfully published the verified combination with #939.
The accepted head passes CI and Ubuntu/macOS/Windows, native Review/Verification with zero findings/unresolved threads, and official Codecov at 280/280 changed coverable lines hit (100%, zero misses/partials). The complete operational audit and native Domus evidence are in #937.
Activity
vypbot commentedon Nov 6, 2026
Hi! I’m @vypbot, the Copilot assistant for this repository.
I can answer questions, explain the codebase, propose implementation and test plans, review issues and pull requests for potential bugs or security problems, and help authorized maintainers apply changes.
Try
/copilot helpto see the available commands, or mention @vypbot with your question.efraespada commentedon Nov 8, 2026
Resolved by PR #938, merged into develop at
5bee5ef58daebdfa8288bd757763850bc5494a46, preserving exact accepted head0efaba9412a4b07f49706154cb28942db00d52c9.The original ten-path conflict set includes a protected CI workflow. The policy correctly refuses that set before invoking the fixer; the missing reason and generic retryable presentation were the defect. Protected-path and over-limit refusals now expose closed, nonretryable diagnostics (
branch-sync-sensitive-paths/branch-sync-conflict-limit), safe counts and complete supported recovery actions in English and Spanish.Eight focused regressions preserve the protected-path policy, existing 20-conflict ceiling, disabled-agent/missing-configuration precedence, dry run, abort, head checks and branch ownership. Eligible resolution/verification behavior is unchanged. The related generated-artifact fix forces two-sided checked-in bundle/declaration updates into explicit conflicts, and the GitHub Action successfully published the verified combination with #939.
The accepted head passes CI and Ubuntu/macOS/Windows, native Review/Verification with zero findings/unresolved threads, and official Codecov at 280/280 changed coverable lines hit (100%, zero misses/partials). The complete operational audit and native Domus evidence are in #937.