https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38486
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #13 from Alex Buckley <[email protected]> --- Hi Kyle, We are testing this patchset for 24.05.x backport. When we cherry-pick the first patch from 24.11.x onto 24.05.x it applies cleanly. But the second patch conflicts, see below: --- kohadev-koha@kohadevbox:koha(24.05.x)$ git cherry-pick 34df58a5b98f8f36e8820666834a76a0bf7167d2 Auto-merging C4/SIP/ILS.pm CONFLICT (content): Merge conflict in C4/SIP/ILS.pm error: could not apply 34df58a5b98... Bug 38486: For SIP allow noblock checkouts reguardless of normal patron checkout blocks hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". kohadev-koha@kohadevbox:koha(24.05.x|CHERRY-PICKING)$ git status On branch 24.05.x You are currently cherry-picking commit 34df58a5b98. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: C4/SIP/ILS.pm no changes added to commit (use "git add" and/or "git commit -a") (failed reverse-i-search)`sed': re^Ct_all kohadev-koha@kohadevbox:koha(24.05.x|CHERRY-PICKING)$ --- Could you please attach a 24.05.x rebase for the second patch to this bug report? Thanks in advance, Alex -- 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/
