Skip to content

fix: force-push in mirror workflow to handle squash merge divergence#19

Merged
zaccesss merged 1 commit into
mainfrom
fix/mirror-force-push
Jun 5, 2026
Merged

fix: force-push in mirror workflow to handle squash merge divergence#19
zaccesss merged 1 commit into
mainfrom
fix/mirror-force-push

Conversation

@zaccesss

@zaccesss zaccesss commented Jun 5, 2026

Copy link
Copy Markdown
Owner

Summary

  • Mirror workflow now uses `--force` on all three targets (GitLab, Codeberg, Gitea)
  • These remotes are not sources of truth — GitHub main is
  • Squash merges create diverged history on mirrors; `--force` is the correct fix

Why

The v1.0.6 mirror run failed because the PR branch was pushed directly to GitLab/Codeberg via `gp` before the squash merge, leaving a different commit there than the squash commit on GitHub main.

Mirrors (GitLab, Codeberg, Gitea) are not sources of truth — GitHub main
is. Using --force ensures squash merges and rebases never cause the mirror
job to reject and fail.
@zaccesss zaccesss enabled auto-merge (squash) June 5, 2026 05:41
@zaccesss zaccesss merged commit b5619c0 into main Jun 5, 2026
3 checks passed
@zaccesss zaccesss deleted the fix/mirror-force-push branch June 5, 2026 05:41
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