[Koha-bugs] [Bug 10648] In records merge greatest field can not be added

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

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

I'm just a bot <gitbot at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |gitbot at bugs.koha-community.
                   |                            |org

--- Comment #4 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 10648 - In records merge greatest field can not be added
Using index info to reconstruct a base tree...
M    cataloguing/merge.pl
M    koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
Auto-merging cataloguing/merge.pl
CONFLICT (content): Merge conflict in cataloguing/merge.pl
Patch failed at 0001 Bug 10648 - In records merge greatest field can not be
added
The copy of the patch that failed is found in:
   /home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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