[Koha-bugs] [Bug 8064] Merge several biblio records

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8064

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

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

--- Comment #60 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply currently:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 8064: Merge several biblios
Applying: Bug 8064: Change the way target record is built.
Using index info to reconstruct a base tree...
M    koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc
M    koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc
Failed to merge in the changes.
Patch failed at 0001 Bug 8064: Change the way target record is built.
The copy of the patch that failed is found in:
   /home/katrin/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/SIGNED-OFF-Bug-8064-Change-the-way-target-record-i-ze4drL.patch

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