fix(git): land the #76-#80 stack that never reached master - #85
Merged
Conversation
# Conflicts: # .github/workflows/go.yml # CHANGELOG.md
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #85 +/- ##
==========================================
+ Coverage 82.16% 83.61% +1.44%
==========================================
Files 27 35 +8
Lines 673 946 +273
==========================================
+ Hits 553 791 +238
- Misses 77 100 +23
- Partials 43 55 +12 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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.
PRs #76, #77, #78, #79 and #80 are marked merged on GitHub, but none of their work is in
master. This branch brings all 24 commits in, without the still-open #81.What happened
The five PRs formed a stack where each PR's base was the previous branch rather than
master:#82mergedchore/go-toolchain-1-26-6intomasterat 10:54. Seven minutes later#76merged its branch into
chore/go-toolchain-1-26-6- a branch that was, by then,already behind
master's future. Every subsequent merge went sideways into a neighbouringbranch, so the chain never reached
mastereven once.Verification that
masterreally lacks the work: no file undercmd/orinternal/matches
insert,skip-header,no-backuporrate limit, and the packagesinternal/core/usecase/insertmd,internal/core/usecase/skipheader,internal/adapters/tokenresolver.goandinternal/core/entity/marker.godo not exist there.What this branch is
Branched from
fix/rate-limit-hint(db7cdf2, the tip of #80), withorigin/mastermerged in. That is exactly the scope of #76-#80: 24 commits, 50 files, +2143/-85.
fix(toc): prefix links with the document path for multiple inputsfeat(cli): STDIN marker-,token.txt, fuller--versionfeat(insert):--insertand--no-backupfeat(skip-header): the--skip-headerflagfix(github): explain rate limiting in 403 and 429The Docker work from #81 is deliberately excluded.
Nothing was lost in the original mis-merge. The five merge commits GitHub created
(
b7173b5,71d81dc,7a079de,daee87e,abcf43b) merge a descendant into its ownancestor and carry no unique content - the tree of
feat/skip-headeris byte-identical tofix/rate-limit-hint. They are the only commits those branches hold that this one does not.Merge conflicts resolved
Both came from #84 and were taken from
master:.github/workflows/go.yml- keep the matrix at1.26.6only, drop1.21.xCHANGELOG.md- keep the "requires Go 1.26 or newer" wording, add the chore(go): require Go 1.26 #84 linkVerification
Coverage on the packages that arrive with this branch:
insertmd98.0%,skipheader83.9%.Follow-up
#81 still targets
fix/rate-limit-hint. Once this lands it should be retargeted tomasterand rebased.