found on the Internet:
.gitattributes + merge=ours, :
config.xml
config.xml merge=ours
git config merge.ours.driver true config
.gitattributesgit
.gitattributes file
pom.conf merge=ours
pom.conf diff=nodiff
but when there is no conflict, the configuration file will still merge. The configuration file does not want to modify
git diff master without pom.conf, but git merge will still merge pom.conf unless the pom.conf file conflict (only the first conflict is valid), merge again when merge, how to ignore pom.conf in merge.
cannot be written in .gitignore because it has to be modified and automated deployment