docs📝: which branches are lines of development, and which are not - #138
Merged
Conversation
release/v1.7 is an ancestor of main, not a fork, so fixes only ever move one way. The other three remote branches are abandoned; two of them are the same commit under different names, and one is from 2024 against a layout that no longer exists.
There was a problem hiding this comment.
Pull request overview
This PR documents branch lineage, abandoned remotes, and ancestry guidance.
Changes:
- Clarifies
mainandrelease/v1.7history. - Catalogs abandoned branches.
- Adds branch ancestry guidance.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
|
|
||
| | branch | last commit | what it is | | ||
| | --- | --- | --- | | ||
| | `up` | `2024-01-08` | Thirty-seven refactors and dependency bumps against the pre-v2 layout. Its one idea worth having — typed claim accessors, including one for identities beyond float64 — is in `jwtauth` now, arrived at independently four years later. Its own `claims.go` discards the result of an `fmt.Errorf`. | |
Comment on lines
+84
to
+85
| Everything else on the remote is abandoned. Read the SHA before assuming a | ||
| branch name means what it says: |
Comment on lines
+94
to
+95
| neither line. Ahead of `main` alone means it was cut from `main`; ahead of | ||
| `release/v1.7` alone means it predates the v2 split. |
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
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.
Three of the four remote branches are abandoned, and the branch names do not say so. Two of them are the same commit under different names; one is from 2024 against a layout that no longer exists.
Worth writing down because it was not obvious from the outside:
release/v1.7is an ancestor ofmain, not a fork. Nothing on v1 is missing from v2, so fixes only ever move one direction. I assumed otherwise for a while and looked for v1-only fixes that could not exist.The
upbranch is the interesting one. It reached the same conclusion about claim types that #136 reaches — typed accessors, including one for identities beyondfloat64— in 2022, and it never shipped. Its own version discards the result of anfmt.Errorf.