On Fri, Jan 16, 2026 at 07:21:21AM -0800, Junio C Hamano wrote:

Elijah Newren [off-list ref] writes:

quoted

On Tue, Jan 13, 2026 at 1:54 AM Patrick Steinhardt [off-list ref] wrote:
[...]

quoted

Changes in v11:
  - Fix overly clever `BUG()` condition.
  - Drop the `struct replay_result::merge_conflict` field.
  - Return a positive value from `replay_revisions()` in case there was
    a conflict.
  - Improve a commit message.
  - Fix check for whether `setup_revisions_from_strvec()` was
    successful.
  - Link to v10: https://lore.kernel.org/r/20260112-b4-pks-history-builtin-v10-0-e3c6aa5b4cec@pks.im (local)

This version looks good to merge down.

Thanks.

FWIW, I think it's far from ready to be merged.