https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37389
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #40 from Katrin Fischer <[email protected]> --- I am sorry, but this no longer applies. I fixed the first conflict in the test file, but then got stuck here: kohadev-koha@kohadevbox:koha(main|AM 1/1)$ git bz apply --continue Applying: Bug 37389: Add tests Applying: Bug 37389: ExtendedAttributes mixin Using index info to reconstruct a base tree... M Koha/REST/Plugin/Objects.pm M Koha/REST/Plugin/Query.pm Falling back to patching base and 3-way merge... Auto-merging Koha/REST/Plugin/Query.pm CONFLICT (content): Merge conflict in Koha/REST/Plugin/Query.pm Auto-merging Koha/REST/Plugin/Objects.pm CONFLICT (content): Merge conflict in Koha/REST/Plugin/Objects.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 37389: ExtendedAttributes mixin 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-37389-ExtendedAttributes-mixin-iims1jsb.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/
