conflict support 5 - add merge conflict-state minimap#6
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: fee7222193
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| accept_both_theirs_then_ours = true, | ||
| ignore_ours = true, | ||
| ignore_theirs = true, | ||
| keep_base = true, |
There was a problem hiding this comment.
Removing ignore_ours and ignore_theirs from the allowed merge keymap set will now make setup() fail for existing configs that still include those previously supported keys, because validate_known_keys treats them as unknown and errors out. This creates an upgrade-time startup break for users who copied prior defaults, so these keys should be accepted as backward-compatible aliases (or migrated to keep_base) before validation.
Useful? React with 👍 / 👎.
| MERGE_UNRESOLVED = 5, | ||
| MERGE_HANDLED = 6, |
There was a problem hiding this comment.
MERGE_UNRESOLVED is assigned a lower numeric state than MERGE_HANDLED, but downsample() picks the highest state value when multiple lines map to one minimap pixel. On long files where unresolved and handled conflicts collapse into the same pixel, unresolved conflicts will be painted as handled, which hides remaining unresolved work in the minimap. Assign unresolved a higher priority than handled (or use explicit priority ordering) to keep unresolved conflicts visible.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Resolved in polyphilz/3-pane-7
polyphilz
force-pushed
the
polyphilz/3-pane-3.25
branch
from
0986ca0 to
5875fa0
Compare
polyphilz
changed the title
polyphilz
force-pushed
the
polyphilz/3-pane-3.5
branch
from
fee7222 to
dc07749
Compare
1 participant
No description provided.