Resolve merge conflicts for v0.14.0 release#213
Closed
Copilot wants to merge 2 commits intorelease/v0.14.0from
Closed
Resolve merge conflicts for v0.14.0 release#213Copilot wants to merge 2 commits intorelease/v0.14.0from
Copilot wants to merge 2 commits intorelease/v0.14.0from
Conversation
Merged
Co-authored-by: deholic <712513+deholic@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Release v0.14.0 with updates and bug fixes
Resolve merge conflicts for v0.14.0 release
Jan 29, 2026
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.
PR #212 had merge conflicts preventing
release/v0.14.0from merging intomain.Changes
src/ui/components/TimelineItem.tsx(trailing whitespace difference)mainbranch changes, including v0.13.0 Misskey favorite feature revertThe conflict was a trivial formatting difference at EOF - no functional changes required.
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.