https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14578 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #13 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, but this no longer applies: 91933 - Bug 14578: Allow manual merging of import records on match Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14578: Allow manual merging of import records on match Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt M koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 14578: Allow manual merging of import records on match 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". Patch left in /tmp/Bug-14578-Allow-manual-merging-of-import-records-o-4t26wv.patch -- You are receiving this mail because: You are watching all bug changes.