feat: add interactive three-way conflict resolver by noahbclarkson · Pull Request #78 · noahbclarkson/rgitui

noahbclarkson · 2026-08-27T07:51:43Z

Summary

replace the dormant read-only conflict view with an interactive Current / Result / Incoming resolver
derive conflict regions from Git's unmerged index and merge engine while preserving exact bytes, CRLF endings, and missing final newlines
support independent per-region choices, both-side ordering, reset, whole-file choices, editor handoff, and save-and-stage
handle add/add, modify/delete, binary, executable, special-file, Unicode-path, and multi-region conflicts
prevent unsafe staging with conflict-aware Stage / Stage All behavior, stale snapshot detection, external-edit protection, and conflict-marker rejection
route resolver work through the owning repository/worktree and document the new shortcuts and feature

Validation

cargo fmt --all -- --check
cargo test --workspace --all-targets
cargo clippy --workspace --all-targets -- -D warnings
cargo check --workspace --features rgitui/perf
cargo build --release
Computer Use walkthrough against a disposable repository covering two independent text regions, add/add, modify/delete, binary, and Unicode-path conflicts; verified the resulting merge and exact staged contents with Git

Closes #77

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d671f8af83

ℹ️ 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".

noahbclarkson · 2026-08-27T10:09:09Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f55fdd6667

ℹ️ 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".

noahbclarkson · 2026-08-27T10:24:03Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: da2910faf3

ℹ️ 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".

noahbclarkson · 2026-08-27T10:38:52Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b8a9ef8230

ℹ️ 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".

noahbclarkson · 2026-08-27T10:50:15Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b6aba8d622

ℹ️ 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".

noahbclarkson · 2026-08-27T11:00:44Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 25db27d40c

ℹ️ 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".

noahbclarkson · 2026-08-27T11:20:33Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 72f941bb93

ℹ️ 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".

noahbclarkson · 2026-08-27T11:36:11Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: beca9b43d7

ℹ️ 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".

noahbclarkson · 2026-08-27T11:52:40Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4b65876fc8

ℹ️ 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".

noahbclarkson · 2026-08-27T12:02:38Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 03d5630b0e

ℹ️ 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".

noahbclarkson · 2026-08-27T12:15:17Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1009237292

ℹ️ 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".

noahbclarkson · 2026-08-27T12:33:15Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3d4070fec2

ℹ️ 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".

noahbclarkson · 2026-08-27T12:44:58Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 86b390536c

ℹ️ 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".

noahbclarkson · 2026-08-27T13:20:45Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cedf71c532

ℹ️ 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".

noahbclarkson · 2026-08-27T13:32:43Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ba4eff2da7

ℹ️ 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".

noahbclarkson · 2026-08-27T13:57:38Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 72d0e3db1e

ℹ️ 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".

noahbclarkson · 2026-08-27T14:13:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6b1740489a

ℹ️ 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".

noahbclarkson · 2026-08-27T14:28:58Z

@codex review

chatgpt-codex-connector · 2026-08-27T14:29:10Z

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

feat(conflicts): add interactive three-way resolver

d671f8a

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_diff/src/lib.rs

Comment thread crates/rgitui_git/src/project/diff.rs Outdated

Comment thread crates/rgitui_git/src/project/diff.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs

codex: address PR review feedback (#78)

f55fdd6

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/diff.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

da2910f

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

b8a9ef8

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/diff.rs Outdated

codex: address PR review feedback (#78)

b6aba8d

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_diff/src/lib.rs

codex: address PR review feedback (#78)

25db27d

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/types.rs

codex: address PR review feedback (#78)

72f941b

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/types.rs Outdated

Comment thread crates/rgitui_workspace/src/workspace/events.rs

codex: address PR review feedback (#78)

beca9b4

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

4b65876

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

03d5630

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

1009237

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

3d4070f

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

codex: address PR review feedback (#78)

86b3905

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_workspace/src/workspace/events.rs

Comment thread crates/rgitui_diff/src/lib.rs

noahbclarkson added 2 commits August 28, 2026 00:51

codex: address PR review feedback (#78)

a117e91

codex: address PR review feedback (#78)

cedf71c

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_diff/src/lib.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs

codex: address PR review feedback (#78)

ba4eff2

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_git/src/project/local_ops.rs Outdated

Comment thread crates/rgitui_diff/src/lib.rs Outdated

codex: address PR review feedback (#78)

72d0e3d

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs

codex: address PR review feedback (#78)

6b17404

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread crates/rgitui_git/src/project/local_ops.rs

Comment thread crates/rgitui_git/src/project/local_ops.rs

codex: address PR review feedback (#78)

c64fdfd

noahbclarkson merged commit 1681a96 into main Aug 27, 2026
4 checks passed

noahbclarkson deleted the codex/issue-77-conflict-resolver branch August 27, 2026 14:58

Conversation

noahbclarkson commented Aug 27, 2026

Summary

Validation

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

noahbclarkson commented Aug 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review