Hi, On Mon, 1 Oct 2007, martin f krafft wrote: > Feature branch A has a .gitignore file, and it's been merged into > master for a while. Today, feature branch B failed to merge into > master because it also provides a .gitignore file. You might be interested in writing a merge driver. See Documentation/gitattributes.txt. Hth, Dscho - 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
