From 3cb0b24a1580129d391b0266b9cb44108b983b6d Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Fri, 9 Oct 2015 13:55:17 +0200 Subject: [PATCH 1/1] Add files to ignore on merge conflict if the 'ours' driver is configured --- .gitattributes | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitattributes b/.gitattributes index 567745fa5..37da9b4af 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 + +# 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 -- 2.34.1