suvayu ali <fatkasuvayu+linux@xxxxxxxxx> writes: > ... So when I came across > the possibility of using .gitattributes for file specific merge > strategies, I tried the following: > > pattern merge=ours I do not think we say .gitattributes can give merge strategy anywhere in our document. You can choose one of the few built-in merge drivers but "ours" is not one of them. Have you defined your own merge driver "ours" following the example in the gitattributes documentation (look for "feel-free merge driver")? -- 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