Thank you. I don't know how I missed that one :-~ On Thu, Oct 28, 2010 at 2:01 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > 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