ux(add): during an in-progress merge, staging a just-resolved conflicted file reports "Nothing new to stage (all N already staged)" #25

New issue

Closed

opened 2026-07-11 22:07:55 +00:00 by hexajon · 0 comments

hexajon commented

2026-07-11 22:07:55 +00:00

(Migrated from codeberg.org)

Hit live 2026-07-10 during an earlier reconcile: after hand-resolving the conflicted docs/adr/README.md (markers removed via editor), madt_add files=["docs/adr/README.md"] returned Nothing new to stage (all 65 already staged). The resolution DID end up staged and the merge completed correctly, but mid-conflict that message reads as "your resolution was ignored" — the caller can't tell whether the resolved content is what got staged.

Ask: during an in-progress merge (MERGE_HEAD present), madt_add's confirmation should be conflict-aware — e.g. "staged resolution for docs/adr/README.md (was conflicted); N other files already staged by the merge" — and never report a just-named resolved path as "nothing new".

Hit live 2026-07-10 during an earlier reconcile: after hand-resolving the conflicted `docs/adr/README.md` (markers removed via editor), `madt_add files=["docs/adr/README.md"]` returned `Nothing new to stage (all 65 already staged)`. The resolution DID end up staged and the merge completed correctly, but mid-conflict that message reads as "your resolution was ignored" — the caller can't tell whether the resolved content is what got staged. Ask: during an in-progress merge (MERGE_HEAD present), madt_add's confirmation should be conflict-aware — e.g. "staged resolution for docs/adr/README.md (was conflicted); N other files already staged by the merge" — and never report a just-named resolved path as "nothing new".

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

sixfold-space/madtea#25

No description provided.

Rows
Columns