[Koha-bugs] [Bug 17897] Koha::SearchMappingManager - Simplify search mapping modifications

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

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

Victoria Faafia <vfaafia29 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |vfaafia29 at gmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #7 from Victoria Faafia <vfaafia29 at gmail.com> ---
git bz apply 17897
Bug 17897 - Koha::SearchMappingManager - Simplify search mapping modifications

102475 - Bug 17897: Koha::SearchMappingManager - Simplify search mapping
modifications
102476 - Bug 17897: (follow-up) Cleanup after tests

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17897: Koha::SearchMappingManager - Simplify search mapping
modifications
Using index info to reconstruct a base tree...
M       Koha/SearchEngine/Elasticsearch.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/SearchEngine/Elasticsearch.pm
CONFLICT (content): Merge conflict in Koha/SearchEngine/Elasticsearch.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 17897: Koha::SearchMappingManager - Simplify search
mapping modifications
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-17897-KohaSearchMappingManager---Simplify-sear-JiTslW.patch

patch does not apply

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