https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19287
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #56 from Katrin Fischer <[email protected]> --- The third patch won't apply, can you please take a look? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19287: Add ability to mark an item 'Lost' from 'Holds to pull' list Applying: Bug 19287: Fix conflict with bug 19304 Applying: Bug 19287: Fix conflict with bug 19974 error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref). error: could not build fake ancestor Patch failed at 0001 Bug 19287: Fix conflict with bug 19974 The copy of the patch that failed is found in: .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-19287-Fix-conflict-with-bug-19974-Ayu3UB.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/
