https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17385
--- Comment #7 from Michael Kuhn <[email protected]> --- I have set up a completely new kohadevbox. vagrant@kohadevbox:~$ cd kohaclone vagrant@kohadevbox:kohaclone(master)$ git pull Already up-to-date. vagrant@kohadevbox:kohaclone(master)$ git checkout -b 001 Switched to a new branch '001' Then I tried to apply patch 17385 again, but I was not able to do it: vagrant@kohadevbox:kohaclone(001)$ git bz apply 17385 Bug 17385 - Add custom export notices 55961 - Bug 17385 - Add custom export notices Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17385 - Add custom export notices fatal: sha1 information is lacking or useless (opac/opac-detail.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 17385 - Add custom export notices The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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-17385---Add-custom-export-notices-0lLL49.patch -- 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/
