https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39325
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #63 from Katrin Fischer <[email protected]> --- I am sorry, I already got a conflict again :( Can you please also check: I tried to leave off the first DO NOT PUSH patch (git bz apply -i), but then I also get a conflict, so I think some later patch also touches it... Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39325: [DO NOT PUSH] script Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. Applying: Bug 39325: .codespell-ignore Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. Applying: Bug 39325: Add test Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. Applying: Bug 39325: Automatic fix .git/rebase-apply/patch:585: trailing whitespace. C<$needsconfirmation> a reference to a hash. It contains reasons why the loan .git/rebase-apply/patch:882: trailing whitespace. selects which template to use, either the opac or the intranet .git/rebase-apply/patch:2515: trailing whitespace. =cut .git/rebase-apply/patch:3763: trailing whitespace. =item cloud-kw.pl [--verbose|--help] --conf=F<cloud.conf> warning: 4 lines add whitespace errors. Using index info to reconstruct a base tree... M Makefile.PL M koha-tmpl/opac-tmpl/bootstrap/js/datatables.js .git/rebase-apply/patch:585: trailing whitespace. C<$needsconfirmation> a reference to a hash. It contains reasons why the loan .git/rebase-apply/patch:882: trailing whitespace. selects which template to use, either the opac or the intranet .git/rebase-apply/patch:2515: trailing whitespace. =cut .git/rebase-apply/patch:3763: trailing whitespace. =item cloud-kw.pl [--verbose|--help] --conf=F<cloud.conf> warning: 4 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/js/datatables.js CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/js/datatables.js Auto-merging Makefile.PL error: Failed to merge in the changes. Patch failed at 0001 Bug 39325: Automatic fix hint: Use 'git am --show-current-patch=diff' to see the failed 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-39325-Automatic-fix-c49605tp.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/
