https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18887
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #10 from Alex Buckley <[email protected]> --- Hi Kyle Can you please rebase against master because when trying to apply the patches up to and including the 'port max_holds_rules to new CirculationRules systems' (after applying the dependency: patch 15524) I got the below merge error. The issue is in Koha/Schema/Result/Branch.pm file. Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 18887 - Update database Applying: Bug 18887 - Add new schema file Applying: Bug 18887 - Update existing schema files Using index info to reconstruct a base tree... M Koha/Schema/Result/Branch.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Branch.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Branch.pm Failed to merge in the changes. Patch failed at 0001 Bug 18887 - Update existing schema files 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-18887---Update-existing-schema-files-74PCpN.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/
