https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34326
Emmanuel Bétemps <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #8 from Emmanuel Bétemps <[email protected]> --- Hi, (I assumed step 0 was 'Apply patch, update the database, retart service') here is what 'git bz apply 34326'gives : Applying: Bug 34326: Add forbidden notforloan status option Using index info to reconstruct a base tree... M C4/SIP/ILS.pm M C4/SIP/ILS/Transaction/Checkin.pm Falling back to patching base and 3-way merge... Auto-merging C4/SIP/ILS/Transaction/Checkin.pm CONFLICT (content): Merge conflict in C4/SIP/ILS/Transaction/Checkin.pm Auto-merging C4/SIP/ILS.pm CONFLICT (content): Merge conflict in C4/SIP/ILS.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 34326: Add forbidden notforloan status option -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
