fedora-infra / rpmautospec

#230 RPMAUTOSPEC: unresolvable merge
Closed: Invalid by nphilipp. Opened by didiksupriadi41.

Closed: Invalid
Reopen Issue

Version-Release:
0.2.5-1

This happens when encountering a merge conflict and then resolving it [1]
Are these behavior intended in rpmautospec? [2, 3]

[1] https://docs.fedoraproject.org/en-US/package-maintainers/Package_Maintenance_Guide/#resolving_merge_conflicts
[2] https://packages.fedoraproject.org/pkgs/picocli/picocli/fedora-33-updates.html
[3] https://koji.fedoraproject.org/koji/buildinfo?buildID=1828002

Sorry for taking so long to respond!

Yes, this is intentional, it's documented in the rpmautospec docs along with how you can work around this. It's unlikely to ever be solved better because rpmautospec would have to guess which commits in the two merged branches are even applicable, and in what order and with which release value they should be taken into the changelog.

Metadata Update from @nphilipp:
- Issue close_status updated to: Invalid
- Issue status updated to: Closed (was: Open)
Metadata
None
None
None
None
None
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.