https://github.com/FasterXML/jackson-databind
Raw File
Tip revision: ee45bebf0cfa0f20d4dc6fa4372b3898f01a16cc authored by Tatu Saloranta on 16 June 2021, 17:06:37 UTC
Merge branch '2.7' into 2.8
Tip revision: ee45beb
.gitattributes
# 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
back to top