https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18503
Alex Buckley <alexbuck...@catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |alexbuck...@catalyst.net.nz
Status|Needs Signoff |In Discussion
--- Comment #2 from Alex Buckley <alexbuck...@catalyst.net.nz> ---
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
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
