"Richard Hartmann" <richih.mailinglist@xxxxxxxxx> writes: > The question is if there is a way to to merge these > branches in a way that is conflict-free and includes > all lines. Obviously, the order of the lines is irrelevant > and can be random. gitattributes(5) and look for "union"? -- 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
