| Tatu Saloranta | 82837cc | 2016-01-29 22:31:15 -0800 | [diff] [blame] | 1 | # Do not merge `pom.xml` from older version, as it will typically conflict |
| Tatu Saloranta | 9f01551 | 2016-09-28 14:34:40 -0700 | [diff] [blame] | 2 | # |
| 3 | # note: also need: | ||||
| 4 | # git config --global merge.ours.driver true | ||||
| 5 | # (and if ever need to disable change `true` to `false` | ||||
| Tatu Saloranta | 82837cc | 2016-01-29 22:31:15 -0800 | [diff] [blame] | 6 | |
| 7 | pom.xml merge=ours | ||||