Merge main branch into jsweep PR #8194
Merged
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
Copilot
AI
changed the title
[WIP] Clean add_reaction_and_edit_comment.cjs for improved readability
Merge main branch into jsweep PR
Dec 30, 2025
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.
Merged
origin/main(4,137 commits) into the JavaScript refactoring PR branch using--allow-unrelated-historiesdue to grafted commit history.Changes
-X theirsto accept main's versions, then selectively restored PR's refactored filesadd_reaction_and_edit_comment.cjs(328 lines vs 466 in main) and associated test updatesmake recompile(126 workflows recompiled)Context
The branch had grafted history requiring unrelated histories flag. The two-step merge (accept theirs + restore) avoided resolving 140 individual file conflicts while preserving the PR's core work.
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.