> The second-to-last line of the output needs to be rephrased. Which wording adjustment have you got in mind? > Octopus is not for recording conflicting merges and when it punts you > shouldn't be attempting to resolve and record it as an octopus merge. Would it make sense to specify that the merging process may switch to the strategy "resolve" on demand? Regards, Markus -- 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