feat: Add noMerge config option with auto-detection for GitHub Actions#739
Merged
feat: Add noMerge config option with auto-detection for GitHub Actions#739
Conversation
Member
Author
|
@cursor review |
Contributor
|
Skipping Bugbot: Bugbot is disabled for this repository |
Member
Author
|
@sentry review |
d6196e9 to
a8b5757
Compare
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.
Add `noMerge` as a config option in `.craft.yml` that mirrors the `--no-merge` CLI flag. When enabled, the release branch is not merged back into main/master after publishing. Auto-detects compiled GitHub Actions (Node.js actions with dist/ folder) and defaults to `noMerge: true` for them, since these projects typically have dist/ gitignored on main but need it in release branches. Resolution order: 1. CLI `--no-merge` flag (highest priority) 2. Explicit `noMerge` in .craft.yml 3. Auto-detected compiled GitHub Action 4. Default: merge the branch
a8b5757 to
8f2ab72
Compare
dcramer
approved these changes
Feb 4, 2026
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
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.
Summary
Add
noMergeas a config option in.craft.ymlthat mirrors the--no-mergeCLI flag. When enabled, the release branch is not merged back into main/master after publishing.Key features:
noMerge: true/falseoption in.craft.ymldist/folder) and defaults tonoMerge: true--merge-targetis specified but ignored due to noMergeWhy?
Compiled GitHub Actions (built with
@vercel/nccoresbuild) need thedist/folder in release branches but typically gitignore it on main. Merging the release branch back would overwrite the clean main with compiled artifacts.Example
Changes
- Added tests for config parsing and detection
Cursor Bugbot reviewed your changes and found no issues for commit 8f2ab72src/schemas/project_config.ts- AddednoMergeto config schemasrc/utils/detection.ts- New file withisCompiledGitHubAction()detectionsrc/config.ts- AddedgetNoMergeConfig()accessor functionsrc/commands/publish.ts- Modified merge logic to respect config