https://github.com/FasterXML/jackson-databind
Raw File
Tip revision: 22e6fee563e65942629f904902c30387005ae6ed authored by Tatu Saloranta on 23 January 2023, 00:50:59 UTC
Merge branch '2.13' into 2.14
Tip revision: 22e6fee
.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