aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 780a8a8fe1a5a68af5bb80e683fcbe19ddf20955 (plain)
1
2
3
4
5
6
7
# Do not merge `pom.xml` from older version, as it will typically conflict
#
# note: also need:
# git config --global merge.ours.driver true
# (and if ever need to disable change `true` to `false`

pom.xml merge=ours