[Koha-bugs] [Bug 17674] Allow UI to delete serials in batch
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Oct 4 23:22:29 CEST 2017
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17674
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 #15 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi
Can you please rebase against the master branch, when I apply the patches
attached to this bug report I get the following merge error which is being
thrown by the t/db_dependent/Serials.t file
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17674 - Allow UI to delete serials in batch
Applying: Bug 17674 - Fix problem tabs
Applying: Bug 17674 - Add unit tests
Using index info to reconstruct a base tree...
M t/db_dependent/Serials.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Serials.t
CONFLICT (content): Merge conflict in t/db_dependent/Serials.t
Failed to merge in the changes.
Patch failed at 0001 Bug 17674 - Add unit tests
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-17674---Add-unit-tests-yO9YMv.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list