hmz007
36ed224bac
Signed-off-by: hmz007 <hmz007@gmail.com> Change-Id: Ib87fdbe7a0be7dc961af3500fe9ea4589a127f9f
8 lines
217 B
Plaintext
8 lines
217 B
Plaintext
# 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
|