https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15486 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |severine.queune@bulac.fr --- Comment #58 from Séverine Queune <severine.queune@bulac.fr> --- I can't apply the patch on master branch 17.12.00.037 : Bug 15486 - Restrict number of holds placed by day 71314 - Bug 15486: DB structure change 71315 - Bug 15486: DBIC update 71316 - Bug 15486: Unit tests 71317 - Bug 15486: Extend CanItemBeReserved so it handles daily holds limits 71318 - Bug 15486: Modify request.tt to handle the new error string 72709 - Bug 15486: Make circ rules UI handle holds_per_day Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15486: DB structure change Applying: Bug 15486: DBIC update Using index info to reconstruct a base tree... M Koha/Schema/Result/Issuingrule.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Issuingrule.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Issuingrule.pm Failed to merge in the changes. Patch failed at 0001 Bug 15486: DBIC update The copy of the patch that failed is found in: /var/repositories/koha/.git/rebase-apply/patch -- You are receiving this mail because: You are watching all bug changes.