Skip to content

Pull requests are squash-merged - #52

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 tool pull requests its campaigns open (brineylab/flyloft#297), so the shed's 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.

promote is unaffected: it computes the candidate tag from the tree of the commit that lands on main, and main's up-to-date rule makes that the tree that was built and tested. hello 1.0.1 (#51) was squash-merged by flyloft and promoted this way.

Changes: AGENTS.md and CONTRIBUTING.md (the merge instruction), and two sentences in docs/DESIGN.md that described flyloft's merge.

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