Skip to content

fix: use separate commit for mcp-server version sync to avoid force push#1429

Merged
douenergy merged 1 commit intomainfrom
fix/fix-relaase-flow
Mar 6, 2026
Merged

fix: use separate commit for mcp-server version sync to avoid force push#1429
douenergy merged 1 commit intomainfrom
fix/fix-relaase-flow

Conversation

@goldmedal
Copy link
Copy Markdown
Contributor

Summary

  • The Sync mcp-server version step in the stable release workflow was using git commit --amend --no-edit + git push --force-with-lease
  • This fails with GH013: Cannot force-push to this branch due to branch protection rules on main
  • Fix: use a separate git commit -m "Sync mcp-server version to $version" + regular git push instead

Root Cause

PR #1428 introduced the Sync mcp-server version step by amending the previous commit and force-pushing, which is not allowed on protected branches.

🤖 Generated with Claude Code

The Sync mcp-server version step was using git commit --amend + force push,
which is blocked by the branch protection rule on main. Use a regular new
commit and push instead.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@github-actions github-actions bot added the ci label Mar 6, 2026
@douenergy douenergy merged commit ecff245 into main Mar 6, 2026
10 checks passed
nhaluc1005 pushed a commit to nhaluc1005/text2sql-practice that referenced this pull request Apr 3, 2026
…ush (Canner#1429)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants