trails-cool/trails
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33 commits 46 branches 0 tags 6.5 MiB
Commit graph

2 commits

Author SHA1 Message Date
Ullrich Schäfer
643dfc8c05
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>
 2026-03-23 00:19:57 +01:00
Ullrich Schäfer
cd18436187
Add automerge GitHub Action (#5) 
PRs labeled 'automerge' will squash-merge when all checks pass.
Uses pascalgn/automerge-action. No branch protection needed.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 2026-03-22 22:53:08 +01:00