Draft
Conversation
|
Cursor Agent can help with this pull request. Just |
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
The builtin no-commit-to-branch hook was blocking merges into canary when running in CI (e.g., GitHub Actions). This replaces the builtin hook with a custom one that: - Skips entirely when CI environment variable is set - Blocks direct commits to canary locally (protection preserved) CI environments set the CI variable, so merges via GitHub Actions or other CI systems will work, while local developers are still protected from accidental direct commits to canary. Co-authored-by: vbv <vbv@boundaryml.com>
cursor
bot
force-pushed
the
cursor/canary-merge-precommit-failure-f50d
branch
from
db92a6f to
62701ff
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Template
Thanks for taking the time to fill out this pull request!
Issue Reference
Please link to any related issues
Changes
Please describe the changes proposed in this pull request
This PR resolves an issue where pre-commit hooks prevented merging into the
canarybranch.The
builtinno-commit-to-branchhook, which blocked all commits tocanary, has been replaced.A new custom pre-commit hook,
no-direct-commit-to-canary, is introduced. This hook allows merge commits tocanary(by detecting.git/MERGE_HEAD) while continuing to block direct commits, thus protecting the branch from unintended changes.Testing
Please describe how you tested these changes
Screenshots
If applicable, add screenshots to help explain your changes
PR Checklist
Please ensure you've completed these items
Additional Notes
Add any other context about the PR here
The
canarybranch is intended to be a protected production branch. The previous pre-commit hook was overly restrictive, blocking legitimate merge operations. This change ensures that thecanarybranch remains protected from direct commits while allowing standard merge workflows to proceed without error.Slack Thread