The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Automerge not working with certain version numbers in pom.xml

Huba Peter
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
November 15, 2019

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

0 answers

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

TAGS
AUG Leaders

Atlassian Community Events