Skip to content

chore(ci): remove redundant back-merge.yml workflow#124

Merged
samuelds merged 1 commit into
developfrom
chore/remove-back-merge-workflow
May 1, 2026
Merged

chore(ci): remove redundant back-merge.yml workflow#124
samuelds merged 1 commit into
developfrom
chore/remove-back-merge-workflow

Conversation

@samuelds
Copy link
Copy Markdown
Contributor

@samuelds samuelds commented May 1, 2026

Summary

Remove back-merge.yml workflow — became redundant after switching release sync PRs from squash to merge commits (decision 2026-05-01).

Why

  • Squash created hash divergence main↔develop → workflow needed to re-align
  • With merge commits, main and develop share identical hashes after release sync
  • Recent runs produced empty PRs (closed: fix(ci): back-merge fallback to direct merge #99 core, #219 marketplace)

See also

  • Ruleset main protection: allowed_merge_methods: ['merge']
  • Memory: focusmcp-architecture-decisions.md

Test plan

  • No more PRs auto-created post-release
  • develop/main no longer divergent post-release

The back-merge workflow existed to compensate for hash divergence
between main and develop caused by squash-merging release sync PRs.

As of 2026-05-01, release sync PRs use --merge (regular merge commits)
instead of --squash. main and develop now share identical commit hashes
after each release, eliminating the need for this workflow.

Architecture decision: focusmcp-architecture-decisions.md

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 1, 2026 20:11
@samuelds samuelds added the skip-changeset PR does not require a changeset entry label May 1, 2026
@samuelds samuelds enabled auto-merge May 1, 2026 20:11
@samuelds samuelds merged commit 9e23f15 into develop May 1, 2026
11 checks passed
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Removes the back-merge.yml GitHub Actions workflow that previously created back-merge PRs from main to develop, based on the updated release sync strategy (merge commits instead of squash) that keeps branch histories aligned.

Changes:

  • Delete the .github/workflows/back-merge.yml workflow to stop creating redundant/empty back-merge PRs.
Comments suppressed due to low confidence (1)

.github/workflows/back-merge.yml:1

  • Removing this workflow makes existing documentation stale: CONTRIBUTING.md and docs/RELEASE.md currently instruct maintainers/contributors to run the back-merge workflow after releases. Please update those docs (and any other references to back-merge) as part of this PR, or document the replacement process that reflects the new merge-commit-based release sync.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-changeset PR does not require a changeset entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants