https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24608 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |BLOCKED --- Comment #48 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Sorry, this depends on bug 24609, that is currently Failed QA... and no longer applies. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24609: Create PUT /checkouts/{checkout_id} Using index info to reconstruct a base tree... A api/v1/swagger/definitions/checkout.json A api/v1/swagger/paths/checkouts.json Falling back to patching base and 3-way merge... CONFLICT (modify/delete): api/v1/swagger/paths/checkouts.json deleted in HEAD and modified in Bug 24609: Create PUT /checkouts/{checkout_id}. Version Bug 24609: Create PUT /checkouts/{checkout_id} of api/v1/swagger/paths/checkouts.json left in tree. CONFLICT (modify/delete): api/v1/swagger/definitions/checkout.json deleted in HEAD and modified in Bug 24609: Create PUT /checkouts/{checkout_id}. Version Bug 24609: Create PUT /checkouts/{checkout_id} of api/v1/swagger/definitions/checkout.json left in tree. error: Failed to merge in the changes. Patch failed at 0001 Bug 24609: Create PUT /checkouts/{checkout_id} -- You are receiving this mail because: You are watching all bug changes.