Add files to ignore on merge conflict if the 'ours' driver is configured
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 11:55:17 +0000 (13:55 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 11:55:17 +0000 (13:55 +0200)
.gitattributes

index 567745fa5e74ebc9de6f4513e4930b6fb1d4e56a..37da9b4aff853b8d9905c99416b3a3561afea302 100644 (file)
@@ -1969,3 +1969,16 @@ src/site/fml/troubleshooting.fml -text
 src/site/resources/css/site.css -text
 src/site/resources/images/taxeditor_transformed.png -text
 src/site/site.xml -text
 src/site/resources/css/site.css -text
 src/site/resources/images/taxeditor_transformed.png -text
 src/site/site.xml -text
+
+# The following files will be ignored when merging another
+# branch into this branch in case of merge conflict and 
+# if the 'ours' merge driver is configured.
+# WARNING : This merge driver should NOT be set in development
+#           environments. It is supposed to be used only in CI
+#           environments.
+# The driver can be configured by executing,
+# git config --local merge.ours.driver true
+**/pom.xml merge=ours
+**/MANIFEST.MF merge=ours
+eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours
+eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours
\ No newline at end of file