[WIP] Resolve conflicts for PR related to issue #201 #1
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
* Fix: author slug handling and add resilient author post lookups Signed-off-by: Kaushik Tak <[email protected]> * build minor fix Signed-off-by: Kaushik Tak <[email protected]> --------- Signed-off-by: Kaushik Tak <[email protected]>
- Resolved conflicts by accepting upstream changes for author handling improvements - Kept search functionality additions (SearchCommand component) - Updated package.json with search dependencies (cmdk, fuse.js) - Kept header.tsx with SearchCommand integration
Co-authored-by: anushka-codes1 <[email protected]>
anushka-codes1
requested review from
Copilot
and removed request for
Copilot
Copilot finished reviewing on behalf of
anushka-codes1
November 11, 2025 13:36
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.
PR keploy#201 Conflict Resolution - Complete ✅
Resolution Strategy
Successfully merged
upstream/maininto the fork'smainbranch with the following approach:Accepted upstream improvements for author handling, which included:
utils/sanitizeAuthorSlug.tsutilitylib/api.tsPreserved search functionality from the fork (PR added search bar and few other updates keploy/blog-website#201):
components/SearchCommand.tsx- Main search componentcomponents/ui/command.tsx- shadcn/ui Command componentcomponents/ui/dialog.tsx- shadcn/ui Dialog componentpages/api/search-index.ts- Search API endpointcomponents/header.tsxwith SearchCommand integrationpackage.jsonwith search dependencies (cmdk, fuse.js)Conflicts Resolved
✅ All 14 conflicted files successfully resolved:
Next Steps
The PR keploy#201 in the upstream repository (keploy/blog-website) can now be updated by pushing these resolved changes to the fork's main branch.
Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.