https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30301
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #39 from Katrin Fischer <[email protected]> --- Please rebase or push patches to a remote branch based on recent main: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30301: (QA follow-up) Restore correct terminology error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt). error: could not build fake ancestor Patch failed at 0001 Bug 30301: (QA follow-up) Restore correct terminology 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-30301-QA-follow-up-Restore-correct-terminology-90u9zgfz.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/
