Repository navigation
Restore 64 entries dropped by the merge-conflict fix in 6edd0b0 - #341
Merged
TheJambo merged 1 commit intoOct 28, 2026
Merged
Conversation
Commit 6edd0b0 resolved the geokit-cli conflict against an older copy of README.md, which removed 64 already-merged entries and brought back links that had been removed on purpose (dead amzn.to books, old blog links, the previous agent-qa description, Fake Data Generator, JsonFabrica). This reverts that commit's README changes, keeping geokit-cli and A11yKit (TheJambo#235).
Owner
|
Excellent catch, thank you. |
Contributor
Author
|
It's called eagle eye🦅 |
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.
Hi @TheJambo, heads up: commit 6edd0b0 ("Resolve merge conflicts: add geokit-cli to AI & LLM Testing") seems to have resolved the conflict against an older copy of README.md. Compared with 5af0ac0, it:
What this PR does: it reverts the README changes from 6edd0b0 and keeps everything that's legitimately new since then:
Check: the resulting README equals the README at 5af0ac0 plus the geokit-cli and A11yKit lines, with no other differences.
Disclosure: I maintain Spoof Me, one of the restored entries, which is how I noticed. Thanks for keeping the list going!