From 643dfc8c05e8943c381610db5196921689015cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= Date: Mon, 23 Mar 2026 00:19:57 +0100 Subject: [PATCH] Switch from squash merges to regular merge commits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squash merges caused orphaned commits when pushing after auto-merge. Regular merges preserve full commit history and avoid this issue. - Disabled squash and rebase merge on repo settings - Updated automerge action: MERGE_METHOD squash → merge - Updated CLAUDE.md workflow docs Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/automerge.yml | 2 +- CLAUDE.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 1273139..03929a4 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -24,6 +24,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_LABELS: "automerge" - MERGE_METHOD: "squash" + MERGE_METHOD: "merge" MERGE_DELETE_BRANCH: "true" UPDATE_METHOD: "rebase" diff --git a/CLAUDE.md b/CLAUDE.md index 8b21257..5bbb91a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -114,8 +114,7 @@ pnpm db:studio # Open Drizzle Studio (DB browser) ```bash gh pr create --title "..." --body "..." --label automerge ``` -- PRs with `automerge` label squash-merge and delete the branch automatically -- Use squash merges to keep main history clean +- PRs with `automerge` label merge and delete the branch automatically ### Stacking PRs (for fast local iteration) When working on sequential tasks, stack branches locally: