[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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #49 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
The patch no longer applies, can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14367: Add MARC record history
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
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
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-14367-Add-MARC-record-history-X_q2HV.patch

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