Markus Elfring <Markus.Elfring@xxxxxx> writes: > ... > Automated merge did not work. > Should not be doing an Octopus. > Merge with strategy octopus failed. > > > The merge description was missing (no commit message) in this case. The second-to-last line of the output needs to be rephrased. 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. -- 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