https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21959
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #22 from Katrin Fischer <[email protected]> --- Can you please rebase? Should be easy, but don't want to risk it: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21959: Batch item modification - ability to apply regular expression on text fields Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 21959: Batch item modification - ability to apply regular expression on text fields 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-21959-Batch-item-modification---ability-to-app-HQtELZ.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
