[Koha-bugs] [Bug 23486] Date last seen should be set upon registration
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Mar 23 16:09:01 CET 2022
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23486
Séverine Queune <severine.queune at bulac.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |severine.queune at bulac.fr
--- Comment #5 from Séverine Queune <severine.queune at bulac.fr> ---
Hi Nick !
I get this error message when I apply the patch in a 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
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-23486-DO-NOT-PUSH-Schema-update-1WltcW.patch
I'll be happy to test it when it's fixed, thanks !
Séverine
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list