https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39756
Philip Orr <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #17 from Philip Orr <[email protected]> --- Hi Chloé, I'd like to test this one but I'm not sure about the best procedure to test it. It depends on 43500, 43504 and 43508 - would it be better to test those first and then come back to this one? I tried applying this bug (that is, 39756) and failed at 43508: ``` 📋 Bug 43508 - Extract Koha::Account->add_lost_replacement_fee from chargelostitem • 207940 - Bug 43508: refactor(Account): extract add_lost_replacement_fee • 207941 - Bug 43508: test(Account): add_lost_replacement_fee • 207942 - Bug 43508: (follow-up) Remove non-ASCII character from add_lost_replacement_fee POD Apply? [(y)es, (n)o, (i)nteractive] y Preparing 3 patch(es): ✓ Prepared 3 patch(es) Applying 3 patch(es): Patch application failed for attachment 207940 - Bug 43508: refactor(Account): extract add_lost_replacement_fee Patches left in /tmp/XCidSfC3J1 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: Cannot apply cleanly patches from bug 43508. Everything will be left dirty. Git command (git am -3 /tmp/XCidSfC3J1/0001-207940.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/
