Skip to content

ci: fail closed on semantic upstream conflicts - #4

Merged
albrand merged 3 commits into
oursfrom
fix/upstream-sync-fail-closed
Sep 17, 2026
Merged

albrand merged 3 commits into
oursfrom
fix/upstream-sync-fail-closed

Conversation

@albrand

@albrand albrand commented Sep 17, 2026

Copy link
Copy Markdown
Collaborator

Summary

Keep upstream sync safe when the fork and source diverge in semantic runtime files.

Changes

  • Stop before publishing when merge conflicts are detected.
  • Write the exact conflicted-path manifest to the workflow summary.
  • Preserve hourly polling, single-flight execution, lockfile reconciliation, and validate-before-publish behavior.

Value

The automation can no longer publish a type-invalid hybrid or silently discard fork-owned reliability behavior.

@albrand
albrand merged commit 0fd98c1 into ours Sep 17, 2026
3 of 16 checks passed
@albrand
albrand deleted the fix/upstream-sync-fail-closed branch September 17, 2026 02:59
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.

1 participant