Skip to content

🐛 - Branch sync reports a generic workflow failure after detecting merge conflicts #911

Closed

Description

@efraespada

Is there an existing issue for this?

  • I have searched the existing issues.

Which actions are affected?

Issue

Which platforms are affected?

Linux

Description

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

  1. 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.
  2. Run the command from the published status card, as in the maintainer comment.
  3. 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.

Activity

  1. added
    bugSomething isn't working
    bugfixSomething isn't working
    priority: highCritical issue, needs immediate attention.
    on Nov 6, 2026
  2. added theissue type on Nov 6, 2026
  3. moved this to Todo in vypdevon Nov 6, 2026
  4. vypbot commented on Nov 6, 2026

    @vypbot
    Contributor

    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.

  5. efraespada commented on Nov 8, 2026

    @efraespada
    MemberAuthor

    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.

  6. moved this from Todo to Done in vypdevon Nov 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

100%Progress: 100%bugSomething isn't workingbugfixSomething isn't workingpriority: highCritical issue, needs immediate attention.

Type

Projects

  • Status
    Done

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions