> How can I teach git to produce the correct merge result when > performing the same merge later on? Custom merge driver. Type `man gitattributes` and search for "custom merge driver" Your merge driver can have whatever policy you can program, on a per file basis. -Seth Robertson -- 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