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 #48 from Katrin Fischer <[email protected]> --- Can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39325: [DO NOT PUSH] script Applying: Bug 39325: .codespell-ignore Applying: Bug 39325: Add test 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:3756: trailing whitespace. =item cloud-kw.pl [--verbose|--help] --conf=F<cloud.conf> error: sha1 information is lacking or useless (C4/Languages.pm). error: could not build fake ancestor 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-_xnhnnpe.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/
