https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24815
Jon Knight <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #6 from Jon Knight <[email protected]> --- Trying it on an up-to-date koha-testing-docker with a clean branch off the current origin/master the tests don't apply: $ git bz apply 24815 Bug 24815 - Koha::Cash::Register relations should return sets not undef 100219 - Bug 24815: Correct return values of Koha::Cash::Register relations 100220 - Bug 24815: Add additional tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24815: Correct return values of Koha::Cash::Register relations Applying: Bug 24815: Add additional tests Using index info to reconstruct a base tree... M t/db_dependent/Koha/Cash/Register.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Cash/Register.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Cash/Register.t error: Failed to merge in the changes. Patch failed at 0001 Bug 24815: Add additional tests 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-24815-Add-additional-tests-XWf3eu.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
