[Koha-bugs] [Bug 21903] koha-dump be able to include koha-upload

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

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

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

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

--- Comment #12 from Bouzid Fergani <bouzid.fergani at inlibro.com> ---
HI,
Rebase it for testing.

Bug 21903 - koha-dump be able to include koha-upload

93862 - Bug 21903: koha-dump can export uploaded and temporary uploaded files

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21903: koha-dump can export uploaded and temporary uploaded files
Using index info to reconstruct a base tree...
M       debian/scripts/koha-dump
M       debian/scripts/koha-functions.sh
Falling back to patching base and 3-way merge...
Auto-merging debian/scripts/koha-functions.sh
Auto-merging debian/scripts/koha-dump
CONFLICT (content): Merge conflict in debian/scripts/koha-dump
error: Failed to merge in the changes.
Patch failed at 0001 Bug 21903: koha-dump can export uploaded and temporary
uploaded files
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-21903-koha-dump-can-export-uploaded-and-tempor-jZTdqB.patch

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