https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38666
Sonia Bouis <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #69 from Sonia Bouis <[email protected]> --- Hello, I can't apply the patches on a ktd : kohadev-koha@kohadevbox:koha(closedstacks)$ git bz apply 38666 📋 Bug 38666 - Closed stack requests • 201180 - Bug 38666: Closed stack requests • 201181 - Bug 38666: [DO NOT PUSH] Update DBIC schema • 201182 - Bug 38666: Flag new columns as boolean (SQL12) • 201183 - Bug 38666: Fix CSRF error when cancelling closed stack request • 201184 - Bug 38666: Fix DBI error in pendingreserves.pl • 201185 - Bug 38666: Make checked out closed stack items holdable • 201186 - Bug 38666: Add closed_stack_request_slip_printed to OpenAPI hold schema • 201187 - Bug 38666: Disable hold suspension for closed stack requests at OPAC • 201188 - Bug 38666: Fix terminology on closed stack requests page Apply? [(y)es, (n)o, (i)nteractive] y Preparing 9 patch(es): ✓ Prepared 9 patch(es) Applying 9 patch(es): Patch application failed for attachment 201180 - Bug 38666: Closed stack requests Patches left in /tmp/3NB_re4sM9 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/3NB_re4sM9/0001-201180.patch) failed: error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false" -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list -- [email protected] To unsubscribe send an email to [email protected] website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
