Hi Klas, Klas Lindberg wrote: > What is the recommended way to detect merge/rebase conflicts without > actually modifying the worktree? You might like "git merge-tree". -- 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