conflict support 4 - harden text conflict state transitions#5
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: 0986ca0e9c
ℹ️ 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".
| ours_handled = true, | ||
| theirs_handled = true, | ||
| }, cursor + #candidate.lines) | ||
| add_outcome(manual_outcome(conflict, manual_state, candidate.lines), cursor + #candidate.lines) |
There was a problem hiding this comment.
Using manual_outcome(...) for clean candidate matches means any resolved content line that merely starts with a marker token (for example a literal ======= line in normal text) is reclassified as unresolved, because manual_outcome only does prefix checks via contains_conflict_markers. In that case a fully resolved file can reopen as unresolved and subsequent saves can re-emit merge markers instead of preserving the clean result, which is a behavioral regression from the previous clean-candidate path.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Resolved in polyphilz/3-pane-7
polyphilz
force-pushed
the
polyphilz/3-pane-3
branch
from
0d7fdc0 to
94e92f1
Compare
polyphilz
changed the title
polyphilz
force-pushed
the
polyphilz/3-pane-3.25
branch
from
0986ca0 to
5875fa0
Compare
1 participant
No description provided.