docs(adr)/ First ADR record merge strategy decision under signed-commits#18
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two repository-hygiene items bundled:
Add
docs/adr/0001-merge-strategy.md— records why rebase-and-merge is disabled onmain(incompatible with theRequire signed commitsrule; GitHub re-authors commits during rebase, stripping signatures). Documents that merge-commit and squash-and-merge are both allowed, with per-PR guidance on which to use. Also notes the 2026-05-27 Dependabot transient-error incident so it's not re-investigated.Fix
uvicorn[standart]typo inpyproject.toml. The misspelled extra does not exist on PyPI, so uvicorn's standard extras (uvloop,httptools,websockets,watchfiles) were silently not being installed.uv.lockregenerated accordingly.Bundled in one PR because both are small repository-hygiene items surfaced during the same session. Future PRs will be more narrowly scoped.