Hello,
We have an issue with automerge, conflicts appear with certain pom.xml versions, whereas for other versions it works fine. It works fine when the automerge is done from:
release/6.0 -> release/6.1
release/6.1 -> release/6.3
If fails with merge conflict in pom xml when automerging:
release/6.3 -> release/7.0
The conflict looks like:
<<<<<<< release/7.0
<version>7.0.5-SNAPSHOT</version>
=======
<version>6.3.6-SNAPSHOT</version>
>>>>>>> release/6.3
Note: there are no modifications other than the versions in pom.xml.
Why does it work for 6.x and doesn't for 7.x ?
Thanks in advance,
Huba
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.