On 2025-05-03 00:55, Leigh Scott wrote:
How do you fix this?Changelog * Fri May 02 2025 Leigh Scott<leigh123li...@googlemail.com> - 0.6.0-11 - RPMAUTOSPEC: unresolvable merge https://koji.fedoraproject.org/koji/buildinfo?buildID=2708589
See docs.pagure.org Peculiarities of rpmautospec — rpmautospec documentation <#>🔗 https://docs.pagure.org/fedora-infra.rpmautospec/peculiarities.html <https://docs.pagure.org/fedora-infra.rpmautospec/peculiarities.html>
To resolve this manually, take the applicable parts of the changelog from the affected branches before the merge and put them in the |changelog| file.
-- Luya Tshimbalanga Fedora Design Team Fedora Design Suite maintainer
OpenPGP_0x529982C2682F5484.asc
Description: OpenPGP public key
OpenPGP_signature.asc
Description: OpenPGP digital signature
-- _______________________________________________ devel mailing list -- devel@lists.fedoraproject.org To unsubscribe send an email to devel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
