Build recipes fail any time the base git repo gets updated
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Launchpad itself |
New
|
Undecided
|
Unassigned |
Bug Description
https:/
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:/
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:/
https:/