[Koha-bugs] [Bug 14420] bulkmarcimport.pl - Some problems

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

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |alexbuckley at catalyst.net.nz

--- Comment #7 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Can you please rebase your patch it is currently not applying cleanly on
master, as the below output shows:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14420 : bulkmarcimport.pl - Some problems
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
Failed to merge in the changes.
Patch failed at 0001 Bug 14420 : bulkmarcimport.pl - Some problems
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-14420--bulkmarcimportpl---Some-problems-T8e2dA.patch
You have new mail in /var/mail/vagrant

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