>>>>> "Richard" == Richard Hartmann <richih.mailinglist@xxxxxxxxx> writes: Richard> The question is if there is a way to to merge these branches Richard> in a way that is conflict-free and includes all Richard> lines. Obviously, the order of the lines is irrelevant and Richard> can be random. You can use a custom merge driver especially designed for this case. See gitattributes(5) man page for an explanation of how it works. Sam -- Samuel Tardieu -- sam@xxxxxxxxxxx -- http://www.rfc1149.net/ -- 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
