https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10744
Mazen Khallaf <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #11 from Mazen Khallaf <[email protected]> --- Couldn't apply patch during signoff. $ git bz apply 10744 Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report 110030 - Bug 10744: DO NOT PUSH! Schema change 110031 - Bug 10744 - ExpireReservesMaxPickUpDelay works with hold(s) over report Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10744: DO NOT PUSH! Schema changes Using index info to reconstruct a base tree... M Koha/Schema/Result/OldReserve.pm M Koha/Schema/Result/Reserve.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Reserve.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Reserve.pm Auto-merging Koha/Schema/Result/OldReserve.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/OldReserve.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 10744: DO NOT PUSH! Schema changes 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-10744-DO-NOT-PUSH-Schema-change-RxpQb0.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/
