Switch from squash merges to regular merge commits
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) <noreply@anthropic.com>
This commit is contained in:
parent
75c9f6901b
commit
643dfc8c05
2 changed files with 2 additions and 3 deletions
2
.github/workflows/automerge.yml
vendored
2
.github/workflows/automerge.yml
vendored
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue