https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21958 Michal Denar <black23@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #6 from Michal Denar <black23@gmail.com> --- Hello, can you rebase on master? Thank you. Applying: Bug 21958: Fix bibliographic record field comparison with authority Using index info to reconstruct a base tree... M C4/AuthoritiesMarc.pm M C4/Biblio.pm M C4/Heading.pm M C4/Heading/MARC21.pm M installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql M t/db_dependent/AuthoritiesMarc.t Falling back to patching base and 3-way merge... Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 21958: Fix bibliographic record field comparison with authority 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-21958-Fix-bibliographic-record-field-compariso-DE87lj.patch -- You are receiving this mail because: You are watching all bug changes.