[Koha-bugs] [Bug 29654] Add option to bulkmarimport.pl for matching on original id

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

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

Frank Hansen <frank.hansen at ub.lu.se> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #6 from Frank Hansen <frank.hansen at ub.lu.se> ---
The patch doesn't apply anymore. Rebase please.

Using index info to reconstruct a base tree...
M       misc/migration_tools/bulkmarcimport.pl
Falling back to patching base and 3-way merge...
Auto-merging misc/migration_tools/bulkmarcimport.pl
CONFLICT (content): Merge conflict in misc/migration_tools/bulkmarcimport.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29654: Add match_record_id option to bulkmarimport.pl
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-29654-Add-matchrecordid-option-to-bulkmarimpor-rJcwEW.patch
vagrant at kohadevbox:kohaclone(bug29654|AM 1/1)$

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