Upstream contribution · Yeachan-Heo/oh-my-claudecode
oh-my-claudecode · Report every unmerged path to a rebasing worker
Problem
The team orchestrator only recognized three Git conflict statuses when notifying a worker about a stalled rebase. A path modified by one side and deleted by the other could be missing from the worker's inbox and rebase event.
Engineering response
Parse the full set of unmerged porcelain statuses, including the modify/delete and one-sided add entries. Keep ordinary modifications outside the conflict list.
Evidence and scope
The PR reports one baseline regression failure and 27 passing merge-orchestrator tests in each of two local reruns. The test exercises the message path using the repository's Git mocks.