[Koha-bugs] [Bug 19482] Elasticsearch - prevent removal / editing of required indexes

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

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

Bouzid Fergani <bouzid.fergani at inlibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bouzid.fergani at inlibro.com

--- Comment #34 from Bouzid Fergani <bouzid.fergani at inlibro.com> ---
Hi,
We have conflict when applying.
Bug 19482 - Elasticsearch - prevent removal / editing of required indexes

93371 - Bug 19482 - DB changes
93372 - Bug 19482 - Add support for defining 'mandatory' mappings
93373 - Bug 19482: SCHEMA CHANGES - DO NOT PUSH

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19482 - DB changes
Using index info to reconstruct a base tree...
M       installer/data/mysql/kohastructure.sql
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19482 - DB changes
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-19482---DB-changes-FC4ixa.patch

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