Build recipes fail any time the base git repo gets updated

Bug #1908006 reported by Darxus
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Launchpad itself
New
Undecided
Unassigned

Bug Description

https://code.launchpad.net/~darxus/+archive/ubuntu/linux-firmware-amdgpu-daily/+recipebuild/2690520

The git repo that it's merging only adds a single line of text to a single file, could easily be accomplished with a simple patch:
lp:~darxus/+git/linux-firmware-amdgpu-fix-hirsute-2

This worked, until the base repo got updated: https://code.launchpad.net/+code/~ubuntu-kernel/ubuntu/+source/linux-firmware

Now the merge fails:
...
Auto-merging WHENCE.ubuntu
CONFLICT (add/add): Merge conflict in WHENCE.ubuntu
Automatic merge failed; fix conflicts and then commit the result.

This has happened to me so many times.

The other two versions of this recipe continue to work for groovy and focal, because their base repos haven't been udpated:
https://code.launchpad.net/~darxus/+recipe/linux-firmware-amdgpu-daily-groovy
https://code.launchpad.net/~darxus/+recipe/linux-firmware-amdgpu-daily-focal-2

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.