https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12365 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Status|Needs Signoff |Patch doesn't apply --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 61865 - Bug 12365: Adding a note column to circ rules Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 12365: Adding a note column to circ rules Using index info to reconstruct a base tree... M Koha/Schema/Result/Issuingrule.pm M admin/smart-rules.pl M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging admin/smart-rules.pl Auto-merging Koha/Schema/Result/Issuingrule.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Issuingrule.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 12365: Adding a note column to circ rules 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-12365-Adding-a-note-column-to-circ-rules-pR_pTz.patch -- You are receiving this mail because: You are watching all bug changes.