When "git checkout -m <path>" recreates a merge conflict, it labels the sides "base", "ours" and "theirs", not the labels the original merge used. Phillip Wood's series teaches the ort machinery to write the labels to .git/MERGE_LABELS when it switches to a merge result that contains conflicts. "git checkout -m" then reads that file and uses the same labels.

Wood also raised an open question in the cover letter. Since checkout -m is recreating the original conflict, should Git remember the conflict style as well? With the current series, running git -c merge.conflictStyle=diff3 merge topic followed by git checkout -m <unmerged-path> would recreate conflicts in the configured default style rather than diff3. He said he could not decide if that would be desirable.

In the discussion, Junio Hamano offered a change that Wood called a good idea and said he would use in a re-roll, asking if he could add Hamano's sign-off. On whether his contribution deserved co-authorship credit, Hamano said it probably counts for no more than a Helped-by. The thread had 29 messages in total, 2 of them in the last day, and the style question was not settled in the excerpts.