Add the GitFiletree Merge driver from https://github.com/ThierryGoubier/GitFileTree-MergeDriver

Francois Stephany · Francois Stephany · commit 47824c25d0de · 2014-08-19T17:50:28.000+02:00
diff --git a/repository/.gitattributes b/repository/.gitattributes
@@ -0,0 +1,3 @@
+*.package/monticello.meta/version       merge=mcVersion
+*.package/*.class/methodProperties.json merge=mcMethodProperties
+*.package/*.class/properties.json       merge=mcProperties

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*.package/monticello.meta/version merge=mcVersion`
	`2`	`+.package/.class/methodProperties.json merge=mcMethodProperties`
	`3`	`+.package/.class/properties.json merge=mcProperties`