Elijah Newren <newren@xxxxxxxxx> writes: > +# Commit E: file with contents: > +# <<<<<<< Temporary merge branch 1 > +# C > +# ======= > +# B > +# >>>>>>> Temporary merge branch 2 > +# > +# Now, when we merge commits D & E, does git detect the conflict? This is way too artificial that I personally feel not worth worrying about. -- 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