[Koha-bugs] [Bug 14367] History for MARC records. Roll back changes on a timeline or per field.

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

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

Hakam Almotlak <hakam.almotlak at inLibro.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |hakam.almotlak at inLibro.com

--- Comment #62 from Hakam Almotlak <hakam.almotlak at inLibro.com> ---
patch does not apply
Applying: Bug 14367: Add MARC record history
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Biblio.pm
CONFLICT (content): Merge conflict in C4/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14367: Add MARC record history
hint: Use 'git am --show-current-patch' 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-14367-Add-MARC-record-history-1fUpWI.patch

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