https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28832
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
--- Comment #15 from Katrin Fischer <katrin.fisc...@bsz-bw.de> ---
I am sorry, this no longer applies - can you please rebase?
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 28832: Don't batch modify fields that we don't update
Using index info to reconstruct a base tree...
M tools/batchMod.pl
Falling back to patching base and 3-way merge...
Auto-merging tools/batchMod.pl
CONFLICT (content): Merge conflict in tools/batchMod.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 28832: Don't batch modify fields that we don't update
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-28832-Dont-batch-modify-fields-that-we-dont-up-dHzj6t.patch
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
