[Koha-bugs] [Bug 22785] Manage matches when importing through Stage Marc Record Import

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #69 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I am sorry, but it looks like this will need a bigger rebase:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 22785: Allow option to choose which record match is applied
during import
Using index info to reconstruct a base tree...
M       C4/ImportBatch.pm
A       api/v1/swagger/definitions.yaml
A       api/v1/swagger/parameters.yaml
A       api/v1/swagger/paths.yaml
A       api/v1/swagger/x-primitives.yaml
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (modify/delete): api/v1/swagger/x-primitives.yaml deleted in HEAD and
modified in Bug 22785: Allow option to choose which record match is applied
during import. Version Bug 22785: Allow option to choose which record match is
applied during import of api/v1/swagger/x-primitives.yaml left in tree.
CONFLICT (modify/delete): api/v1/swagger/paths.yaml deleted in HEAD and
modified in Bug 22785: Allow option to choose which record match is applied
during import. Version Bug 22785: Allow option to choose which record match is
applied during import of api/v1/swagger/paths.yaml left in tree.
CONFLICT (modify/delete): api/v1/swagger/parameters.yaml deleted in HEAD and
modified in Bug 22785: Allow option to choose which record match is applied
during import. Version Bug 22785: Allow option to choose which record match is
applied during import of api/v1/swagger/parameters.yaml left in tree.
CONFLICT (modify/delete): api/v1/swagger/definitions.yaml deleted in HEAD and
modified in Bug 22785: Allow option to choose which record match is applied
during import. Version Bug 22785: Allow option to choose which record match is
applied during import of api/v1/swagger/definitions.yaml left in tree.
Auto-merging C4/ImportBatch.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 22785: Allow option to choose which record match is
applied during import
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-22785-Allow-option-to-choose-which-record-matc-Drlq9o.patch

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