Merge conflict on fedora downstream version update for qm rpm

[lsm5]

What happened? What is the problem?

i see a strange issue with packit updates on the qm package . The PRs in there are having a merge conflict with trying to bump versions from 0.5.7 to 0.6.0 when packit had already done a prior PR bump from 0.5.7 to 0.5.8

What did you expect to happen?

should not have had merge conflicts and should have correctly bumped from 0.5.8 to 0.6.0.

Example URL(s)

No response

Steps to reproduce

No response

What is the impacted category (job)?

Fedora release automation

Workaround

• There is an existing workaround that can be used until this issue is fixed.

Participation

• I am willing to submit a pull request for this issue. (Packit team is happy to help!)

[lsm5]

cc @dougsland

[lbarcziova]

hi @lsm5 ! Thanks for reporting, from the first look this really doesn't look right. We need to investigate this more, I will have a look into our logs.

[lbarcziova]

We will try to prioritise this issue since this should definitely not happen. From looking into the logs and the code, this is really strange as we always fetch the latest changes from the dist-git repo.

[majamassarini]

I have analyzed the open/merge branch history and found out that the 0.5.8 related branch was merged after the creation of the 0.6.0 related branch.
After we create a branch we do not automatically update/rebase it and for this reason it went out of sync
I think this work already scheduled could probably prevent this to happen again, what do you think @lbarcziova and @lachmanfrantisek?

branch	for release	action	time
f38	0.5.8	opened	2023-11-01 13:40:52
		merged	2023-11-05 13:06:35
	0.5.9	opened	2023-11-03 20:01:47
	0.6.0	opened	2023-11-05 13:02:08
f39	0.5.8	opened	2023-11-01 13:40:27
		merged	2023-11-05 13:06:11
	0.5.9	opened	2023-11-03 20:00:40
	0.6.0	opened	2023-11-05 13:01:47
rawhide	0.5.8	opened	2023-11-01 13:40:04
		merged	2023-11-05 13:04:01
	0.5.9	opened	2023-11-03 20:00:01
	0.6.0	opened	2023-11-05 13:01:28

[lbarcziova]

@majamassarini good catch! Yes, I think packit/packit#2182 should prevent this from happening.

[majamassarini]

I close this one and start to work on packit/packit#2182