https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28371 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |severine.queune@bulac.fr --- Comment #21 from Séverine Queune <severine.queune@bulac.fr> --- Too old one, doesn't apply anymore... Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28371: Unit tests Using index info to reconstruct a base tree... M t/db_dependent/XSLT.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/XSLT.t CONFLICT (content): Merge conflict in t/db_dependent/XSLT.t error: Failed to merge in the changes. Patch failed at 0001 Bug 28371: Unit tests hint: Use 'git am --show-current-patch=diff' to see the failed 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-28371-Unit-tests-N0CZB6.patch -- You are receiving this mail because: You are watching all bug changes.