[Koha-bugs] [Bug 5725] Batch modifications for Biblios

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Mon Feb 21 17:37:07 CET 2011


http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5725

--- Comment #12 from Nicole C. Engard <nengard at gmail.com> 2011-02-21 16:37:07 UTC ---
I tried to apply this patch on top of the other two and it did not apply. 
Either there is a problem with the patch - or with the way I applied it:

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: BG5725 follow-up : permission is wrong
fatal: sha1 information is lacking or useless (tools/batchedit.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 BG5725 follow-up : permission is wrong
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".
nengard at debian:~/kohaclone$

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.


More information about the Koha-bugs mailing list