conflict support 2 - 3-pane ui, result :write buffer#3
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: 6d047b406e
ℹ️ 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".
|
|
||
| state.write_in_progress = true | ||
| local ok, write_err = xpcall(function() | ||
| write_text(root .. '/' .. file.path, prepared.persisted_text) |
There was a problem hiding this comment.
Persisting the merge result through write_text(...) bypasses Neovim’s normal file write path, so buffer-local write semantics are ignored. In conflict files with non-default settings (for example fileformat=dos, BOM, or encoding-related write behavior), :write from this pane rewrites raw prepared.persisted_text bytes instead of honoring those options, which can silently change line endings/metadata and create unrelated diffs or break downstream tooling expecting the original file format.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Resolved in polyphilz/3-pane-7
polyphilz
force-pushed
the
polyphilz/3-pane-2
branch
from
6d047b4 to
c0b5aaf
Compare
polyphilz
changed the title
1 participant
No description provided.