https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23486
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #7 from Séverine Queune <[email protected]> --- Sorry Nick, I wasn't quick enough to test the first rebase, I have the same error in my DevBox :/ Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23486: Set lastseen to default to current timestamp Applying: Bug 23486: DO NOT PUSH Schema update Using index info to reconstruct a base tree... M Koha/Schema/Result/Borrower.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Borrower.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Borrower.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 23486: DO NOT PUSH Schema update hint: Use 'git am --show-current-patch=diff' to see the failed patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
