https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20390 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |severine.queune@bulac.fr --- Comment #10 from Séverine Queune <severine.queune@bulac.fr> --- Applied on sandbox#12 : The sandbox you've requested is not ready. Some problems occurred applying patches from bug 20390: <h1>Something went wrong !</h1>Applying: Bug 20390: UNIMARC biblio mappings Using index info to reconstruct a base tree... A etc/searchengine/elasticsearch/mappings.yaml Falling back to patching base and 3-way merge... Auto-merging admin/searchengine/elasticsearch/mappings.yaml CONFLICT (content): Merge conflict in admin/searchengine/elasticsearch/mappings.yaml error: Failed to merge in the changes. Patch failed at 0001 Bug 20390: UNIMARC biblio mappings The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 20390 - Elasticsearch - Mappings for UNIMARC (updates existing) 75388 - Bug 20390: UNIMARC biblio mappings 75389 - Bug 20390: (follow-up) UNIMARC biblio mappings 75390 - Bug 20390: (follow-up) UNIMARC mappings Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-20390-UNIMARC-biblio-mappings-lAznq5.patch . -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.