Repository navigation
feat(conflicts): display helper text as a virtual line - #440
Merged
tanvirtin merged 1 commit intoOct 11, 2026
Merged
Conversation
tanvirtin
approved these changes
Oct 11, 2026
tanvirtin
added a commit
that referenced
this pull request
Oct 14, 2026
…e can share a row Extmark:derive_id returned row + 1 for every kind, so a sign and a text (or a text and a virt_line) placed on the same row overwrote each other, last write wins. Give each kind its own id space, restoring main's collision-free scheme. This is what #440 needs: render_conflict_help_text renders the conflict menu as a virtual line above the conflict, which was silently clobbered by the '(Current Change)' text and mark sign on the same row.
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
2 participants
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.
Render the conflict's "helper text" as a virtual line rather than hiding/replacing the buffer content, which often contains information that is quite valuable during conflict resolution.
Note: this might break for users of Neovim < v11 (when virtual lines were introduced). Let me know if you're OK with increasing the base requirements for this plugin (v11+ instead of v10+). Otherwise, I can try to implement a fallback logic.