Junio C Hamano wrote: > > It might be just a simple matter of ... > I don't think it's that simple. Consider the case of an integrator who initially picks the wrong branch. Wouldn't it seem that: git checkout --ours file git add file git status should result in the same output as: git checkout --theirs file git add file git status # oops git checkout --ours file git add file git status I can accept an answer is "no". After all, 'git add' says that you are happy. But it makes me wonder whether the empty "if (s->in_merge)" clause in wt_status_print_cached_header() wouldn't be the right place to handle this case. Aside from that, wouldn't the message "merge result will be the same as HEAD commit" be incorrect if that there are other files which were already merged successfully? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html