Skip to content

resolve-undo: allow resurrecting conflicted state that resolved to deletion

Junio C Hamano git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2resolve-undo: allow resurrecting conflicted state that resolved to deletionresolve-undo.c resolve-undo.h+42 -50 replies
2/2update-index: use unmerge_index_entry() to support removalbuiltin/update-index.c t/t2030-unresolve-info.sh+42 -201 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread