Skip to content

Pull requests are squash-merged - #22

Open
smburbach wants to merge 1 commit into
mainfrom
docs/squash-default
Open

smburbach wants to merge 1 commit into
mainfrom
docs/squash-default

Conversation

@smburbach

Copy link
Copy Markdown
Member

flyloft now squash-merges the dataset pull requests its campaigns open (brineylab/flyloft#297), so the instructions say the same for people: gh pr merge --squash. The repository still allows merge commits and rebase merges, so a case that needs one can still use it.

scripts/promote is unaffected: its guard compares the record on origin/main with the checkout's by content, not by history, so a squash passes it.

Changes: the merge instruction in AGENTS.md and CONTRIBUTING.md. The plans under docs/plans/ are left as the record of how they were carried out.

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