[Koha-bugs] [Bug 19532] Recalls for Koha

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

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

Henry Bolshaw <bolshawh at parliament.uk> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bolshawh at parliament.uk

--- Comment #586 from Henry Bolshaw <bolshawh at parliament.uk> ---
Hi Aleisha, this is a really exciting feature that I'm looking forward to
testing!

I think there must have been some changes to the schema recently because I'm
getting a merge conflict when I try and apply the Updated schema files patch.

Applying: Bug 19532: Updated schema files
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Branch.pm
M       Koha/Schema/Result/Item.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Schema/Result/Item.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Item.pm
Auto-merging Koha/Schema/Result/Branch.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Branch.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19532: Updated schema files

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