Skip to content

Use squash merges for feature pull requests - #457

Open
jaykbpark wants to merge 1 commit into
devfrom
codex/squash-feature-prs
Open

jaykbpark wants to merge 1 commit into
devfrom
codex/squash-feature-prs

Conversation

@jaykbpark

Copy link
Copy Markdown
Contributor

What changed

  • Remove the requirement that every pull request already contain exactly one
    commit.
  • Validate the pull request title instead, since it becomes the squash commit
    subject.
  • Upgrade actions/github-script from v7 to v9 to remove the Node 20
    deprecation warning.
  • Document the intended branch strategy:
    • feature/fix branches → dev: squash and merge
    • devmain: regular merge

Why

The one-commit check was written for feature pull requests but also runs on
release pull requests. PR #448 promotes dev to main, so it correctly
contains the accumulated feature commits and has failed this check since it
opened.

Squashing at merge keeps one commit per feature in dev without forcing
contributors to rewrite their working history. Preserving a regular merge from
dev to main keeps the long-lived branches related.

Repository settings follow-up

This repository currently allows only rebase merges. An admin must enable
Squash merging for feature PRs and Merge commits for devmain. A
branch ruleset should restrict PRs targeting dev to squash merges if strict
enforcement is desired.

Validation

  • Prettier 3.5.3 check passed for the changed files.
  • Workflow YAML syntax check passed.
  • git diff --check passed.
  • Full npm ci is currently blocked by the pre-existing mismatch between
    package.json and package-lock.json; this PR does not change dependencies.

@vercel

vercel Bot commented Jul 20, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
biztech-v2 Ready Ready Preview Sep 7, 2026 11:15pm UTC

@jaykbpark
jaykbpark marked this pull request as ready for review July 20, 2026 06:17
@jaykbpark
jaykbpark changed the base branch from main to dev September 7, 2026 22:59
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.

1 participant