[Koha-bugs] [Bug 18503] Confusing hold and transfer dialog

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Tue May 2 23:36:52 CEST 2017


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18503

--- Comment #3 from Christopher Brannon <cbrannon at cdalibrary.org> ---
Did you apply the(In reply to Alex Buckley from comment #2)
> Hi Christopher 
> 
> When I apply this patch on a up to date clean branch I get the following
> error:
> 
> Applying: Bug 18503: Fixes confusing dialog and other minor
> fatal: sha1 information is lacking or useless
> (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Bug 18503: Fixes confusing dialog and other minor
> 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-18503-Fixes-confusing-dialog-and-other-minor-JMU2nv.patch

Did you apply patch 18490?  This patch depends on it.

-- 
You are receiving this mail because:
You are watching all bug changes.


More information about the Koha-bugs mailing list