https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25260
Emmi Takkinen <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #96 from Emmi Takkinen <[email protected]> --- Tried to test this, but patches do not apply. Received this error: Applying: Bug 25260: Atomic update Using index info to reconstruct a base tree... M C4/Installer.pm Falling back to patching base and 3-way merge... Auto-merging C4/Installer.pm CONFLICT (content): Merge conflict in C4/Installer.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 25260: Atomic update 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-25260-Atomic-update-pnuVUG.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
