http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8185
--- Comment #12 from Jared Camins-Esakov <[email protected]> --- Mirko, I tried to apply the follow-up on top of the original signed off patch, but got the following error: Commit Body is: -------------------------- Bug 8185 Follow-Up: Some more Italian strings changed -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 8185 Follow-Up: Some more Italian strings changed /home/jcamins/kohaclone/.git/rebase-apply/patch:14: tab in indent. <h2>Search for</h2> fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8185 Follow-Up: Some more Italian strings changed When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Should there be another follow-up in between the two? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
