feat: add conflict_ours_position option for merge conflict view layout #165
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
Add new config option to control the position of OURS (:2) buffer in merge conflict views, independent of the original_position setting. Changes: - Add conflict_ours_position option (default: "right") to config - Update commands.lua and render.lua to use the new option - Add comments to conflict_window.lua explaining rightbelow behavior - Document the option in README.md This allows users to customize which side shows their changes (OURS) vs incoming changes (THEIRS) during merge conflict resolution.
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.
Summary
conflict_ours_positionconfig option to control the position of OURS (:2) buffer in merge conflict viewsoriginal_positionsetting, allowing separate customization for normal diff and conflict modesChanges
conflict_ours_positionoption (default:"right")conflict_ours_positioninvscode_merge()functionconflict_ours_positionin explorer mode conflict handlingrightbelowbehavior, userightbelow=falsefor consistent LEFT/RIGHT window arrangementBenefits
original_position, giving more flexibility in workflow preferencesTesting