[Koha-bugs] [Bug 15054] Get items from database instead of search engine in search results

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15054

Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |In Discussion
                 CC|                            |hector.hecaxmmx at gmail.com

--- Comment #4 from Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> ---
Hi Fridolin

Sorry but fail in Merge step, could you please rebase/fix, I think IMHO your
patch is a good solution. The problem you describe is very annoying.

Applying: Bug 15054 - Get items from database instead of search engine in
search results
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Search.pm
CONFLICT (content): Merge conflict in C4/Search.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 15054 - Get items from database instead of search
engine in search results
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".

-- 
You are receiving this mail because:
You are watching all bug changes.