https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7468 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #41 from David Nind <david@davidnind.com> --- I can't seem to apply the patches on the latest master (testing using koha-testing-docker). Here is what I get: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7468 - Print barcodes by range Applying: Bug 7468 - Fix 'false' message on Firefox Applying: Bug 7468 - Add warning when range has non-existent barcodes Applying: Bug 7468 - Showing the error message according to the community interface patterns, fixing a javascript condition Applying: Bug 7468 - (follow-up) Make sure only integers are accepted as from/to values Applying: Bug 7468: Print barcodes by range Using index info to reconstruct a base tree... M C4/Labels/Label.pm M koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt M labels/label-create-pdf.pl M labels/label-print.pl Falling back to patching base and 3-way merge... Auto-merging labels/label-print.pl CONFLICT (content): Merge conflict in labels/label-print.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 7468: Print barcodes by range 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-7468-Print-barcodes-by-range-ZVR8Tv.patch -- You are receiving this mail because: You are watching all bug changes.