https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41048 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #11 from David Nind <david@davidnind.com> --- The patch no longer applies 8-(... git bz apply 41048 📋 Bug 41048 - Add ability to disallow empty patron searches • 188111 - Bug 41048: Add ability to disallow empty patron searches Apply? [(y)es, (n)o, (i)nteractive] y Preparing 1 patch(es): ✓ Prepared 1 patch(es) Applying 1 patch(es): Patch application failed for attachment 188111 - Bug 41048: Add ability to disallow empty patron searches Patches left in /tmp/VCK_R5AeNX for manual application if needed To resolve: 1. Fix conflicts (use 'git mergetool' or edit files manually) 2. Stage resolved files with 'git add' 3. Continue with 'git bz apply --continue' or 'git am --continue' 4. Or skip this patch with 'git bz apply --skip' 5. Or abort with 'git bz apply --abort' Error: Apply failed: Git command (git am -3 /tmp/VCK_R5AeNX/0001-188111.patch) failed: error: Failed to merge in the changes. 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.