Repository navigation
Conversation
compute_merge_fillers_and_conflicts takes an include_base flag that adds Base to the filler alignment, padding the inputs where Base is taller. render_merge_view accepts an optional base buffer and renders Base's side of each conflict plus its fillers. compute_and_render_conflict now takes its optional settings as a table so the base buffer can be passed through.
Show the merge base (:1) as an optional fourth pane in the conflict view: between Incoming and Current in the bottom layout, above Result in the center layout. It is a read-only stage-:1 virtual buffer aligned with both inputs. diff.conflict_show_base enables it by default and the conflict.toggle_base key (<leader>cm) toggles it per session.
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.
Merge Base Pane
Added optional pane for the base of a merge conflict in the merge view. This supports the 4 way merge view workflow personaly favoured by me in messy merges (still use DiffView for this).
The pane can be shown or hidden by default by setting:
The pane can be toggled in the view by
<leader> cmfixes #383
Showcase
conflict_result_position = "bottom"
conflict_result_position = "center"
Changes
:h codediff-merge-baseAI
Used AI to make me femilliar with the code base and its's design. Also to point out factors I might have forgotten (like the possibility of different views (conflict_result_position = "center")).
Possible aditions