Skip to content

don't run semgrep/linting when doing manual merge; the goal is to get…#42

Merged
mattsgarlata merged 1 commit intomainfrom
no-verify
Mar 24, 2026
Merged

don't run semgrep/linting when doing manual merge; the goal is to get…#42
mattsgarlata merged 1 commit intomainfrom
no-verify

Conversation

@jerryorr
Copy link
Copy Markdown
Member

… the

branches in sync, not enforce linting

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 20, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 3563914c-f3fc-4f06-9c9f-5f6909909ee4

📥 Commits

Reviewing files that changed from the base of the PR and between 79a8300 and f251987.

📒 Files selected for processing (1)
  • manual-merge.sh

Walkthrough

The script now uses git push --no-verify instead of git push in three locations where branch refs are pushed to origin. This bypasses pre-push verification hooks during sync operations. All other branch selection, merge, and control flow logic remains unchanged.

Changes

Cohort / File(s) Summary
Git push hook bypass
manual-merge.sh
Added --no-verify flag to three git push commands: after confirming local HEAD differs from origin/, when creating a missing branch-here-<release_branch>, and after fast-forwarding it to origin/<release_branch>.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly summarizes the main change: disabling semgrep/linting during manual merge operations to prioritize synchronizing branches over enforcing code quality checks.
Description check ✅ Passed The description directly relates to the changeset by explaining the rationale (getting branches in sync, not enforcing linting) for the modifications to the manual-merge script.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch no-verify
📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@jerryorr jerryorr requested a review from mattsgarlata March 24, 2026 19:47
@mattsgarlata
Copy link
Copy Markdown
Member

Thanks @jerryorr!

@mattsgarlata mattsgarlata merged commit ef0e297 into main Mar 24, 2026
2 checks passed
@mattsgarlata mattsgarlata deleted the no-verify branch March 24, 2026 21:40
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.

2 participants