https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22924
--- Comment #10 from Bouzid Fergani <[email protected]> --- HI, The patch of tests is not apply correctly. Bug 22924 - Elasticsearch, SysPref FacetMaxCount don't show more than 10 facets 90665 - Bug 22924: Make elasticsearch honour FacetMaxCount system preference 90903 - Bug 22924: Unit tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22924: Make elasticsearch honour FacetMaxCount system preference Applying: Bug 22924: Unit tests Using index info to reconstruct a base tree... M t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t error: Failed to merge in the changes. Patch failed at 0001 Bug 22924: Unit 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-22924-Unit-tests-N6uhfY.patch Bouzid -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
