https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15326 --- Comment #77 from Aleisha Amohia <aleisha@catalyst.net.nz> --- (In reply to Katrin Fischer from comment #66)

Conflicts in the Schema changes part (should be a separate patch) Can you please fix and maybe separate these changes out?

Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15326: Add CMS feature Applying: Bug 15326: (follow-up) Add CMS feature Using index info to reconstruct a base tree... M Koha/Schema/Result/Branch.pm Falling back to patching base and 3-way merge... Removing t/Pages.t Auto-merging Koha/Schema/Result/Branch.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Branch.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 15326: (follow-up) Add CMS feature 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-15326-follow-up-Add-CMS-feature-E4XbRe.patch

Rebased and moved schema fixes into a separate patch -- You are receiving this mail because: You are watching all bug changes.