fix(readme): restore the two Troubleshooting rows #585's merge silently dropped - #598
Merged
Merged
Conversation
…ly dropped
`main`'s Troubleshooting index went back to
| `rate limited (429)` | Throttled; exit `6`. For deep paging use `--cursor`…
which is the exact 🔴 that #591 round 1 fixed, and it now contradicts the
generated section thirty lines above it — which still correctly says the message
reaches 2 or 6 and never 5. The `Civitai returned HTTP` row, the landing place
for the exit-5 case, was gone entirely.
HOW. #591 squash-merged at 02:51. At 03:50 I merged `main` into #585's branch,
resolved the two real conflicts, and took #585's README as the base — then
re-applied the main-side rows I could think of. #591's Troubleshooting rows were
in a region that never conflicted, so git had nothing to say about them and my
spot-check did not think of them.
This is the third time this exact trap has fired today, each time in a region
with no conflict: twice caught during a merge, once shipped to `main`. The
lesson stuck only partly — on the second merge I did run the systematic diff and
it found a drop my spot-check had missed. I did not run it on the first.
🔴 AND I NEARLY DESTROYED THE EVIDENCE. Having merged both PRs I deleted the
orphan branch, saying "nothing unique" — while the `git diff --stat` I had just
printed showed README differing by five lines. The object survived locally, and
those five lines were exactly this fix. Both rows below are restored VERBATIM
from that commit rather than retyped.
Verified: the restored left column `Civitai returned HTTP` is a real fragment of
a string the CLI prints (`pkg/civitai/retry.go:174`), per the index's own stated
rule, and make ci + golangci-lint are clean on the result.
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.
A regression I introduced on
mainan hour ago, and nearly deleted the evidence of.What broke
main's Troubleshooting index reads:That is the exact 🔴 #591 round 1 fixed — it now contradicts the generated
### Exit code 6section thirty lines above, which correctly states the message reaches2or6and never5. And theCivitai returned HTTProw — the only landing place for the exit-5 case — was gone entirely.A user who hits the deep-paging cap greps the message they saw, lands on that row, reads "exit 6", and writes
if rc == 6: backoff; retry— the loop #591 exists to prevent.How
#591 squash-merged at 02:51. At 03:50 I merged
maininto #585's branch, resolved the two real conflicts, took #585's README as the base, and re-applied the main-side rows I could think of. #591's Troubleshooting rows sat in a region that never conflicted, so git had nothing to say and my spot-check did not think of them.Third time this trap fired today, every time in a no-conflict region: twice caught mid-merge, once shipped. On the second merge I did run a systematic
diff main-README vs resultand it caught a drop my spot-check had missed — I had not run it on the first.🔴 And I nearly destroyed the evidence
After merging both PRs I deleted the orphan branch saying "nothing unique" — while the
git diff --statI had just printed showed README differing by five lines. I read past my own output. The object survived locally, and those five lines were exactly this fix.Both rows here are restored verbatim from that commit rather than retyped.
Verified
Civitai returned HTTPis a genuine fragment of a printed string (pkg/civitai/retry.go:174), per the index's own stated rule.make circ=0, 0 FAIL,golangci-lint0 issues.