https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21572
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #40 from Magnus Enger <[email protected]> --- Sorry: $ git bz apply 21572 Bug 21572 - Improve flexibility and consistency of AllowItemsOnHoldCheckoutSIP and AllowItemsOnHoldCheckoutSCO 185328 - Bug 21572: Update CanBookBeIssued to ignore each hold status separately 185330 - Bug 21572: Dbrev - multi-selection for AllowItemsOnHoldCheckout sysprefs 185394 - Bug 21572: Adjust SIP and SCO checkout logic Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21572: Update CanBookBeIssued to ignore each hold status separately Applying: Bug 21572: Dbrev - multi-selection for AllowItemsOnHoldCheckout sysprefs Applying: Bug 21572: Adjust SIP and SCO checkout logic Using index info to reconstruct a base tree... M t/db_dependent/SIP/Transaction.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/SIP/Transaction.t CONFLICT (content): Merge conflict in t/db_dependent/SIP/Transaction.t error: Failed to merge in the changes. Patch failed at 0001 Bug 21572: Adjust SIP and SCO checkout logic hint: Use 'git am --show-current-patch=diff' to see the failed 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-21572-Adjust-SIP-and-SCO-checkout-logic-_z0p7w87.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
