trails-cool/trails
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15 from trails-cool/disable-squash-merge

Browse source
This commit is contained in:
github-actions[bot] 2026-03-22 23:20:10 +00:00 • committed by GitHub
commit d868e78247
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/automerge.yml vendored
View file

@ -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"

3
CLAUDE.md
View file

@ -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: