[Koha-bugs] [Bug 17509] Notify patrons to return items requested on hold by another person

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

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |alexbuckley at catalyst.net.nz
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #42 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi 

Can you please rebase against master, a conflict is thrown when applying these
patches on a clean, up to date branch.

Specifically the patch causing the issue is '[SIGNED-OFF] Bug 17509: Added
notification letter HOLDPLACED_CONTACT' and the file with the conflict is in
installer/data/mysql/uk-UA/mandatory/sample_notices.sql

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17509: Added NotifyToReturnItemWhenHoldIsPlaced syspref
Applying: Bug 17509: Added system preference to restrict recipients based on
library
Applying: Bug 17509: Improved system preferences for item return notification
Applying: Bug 17509: renamed atomic file to suit conventions
Applying: Bug 17509: Removed old name of atomic update file
Applying: Bug 17509: Added notification letter HOLDPLACED_CONTACT
Using index info to reconstruct a base tree...
M       installer/data/mysql/uk-UA/mandatory/sample_notices.sql
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/uk-UA/mandatory/sample_notices.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/uk-UA/mandatory/sample_notices.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 17509: Added notification letter HOLDPLACED_CONTACT
The copy of the patch that failed is found in:
   /home/vagrant/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-17509-Added-notification-letter-HOL-iFsWW_.patch

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