https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37993 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexbuckley@catalyst.net.nz --- Comment #30 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Hi Martin, Just testing this for 24.05.x backport. Cherry-picking the second patch from 24.11.x onto 24.05.x conflicts (see below). Would you mind please attaching rebased 24.05.x patches to this bug report? ---- kohadev-koha@kohadevbox:koha(24.05.x)$ git cherry-pick 4dcaef65ca9595663fcc0ba6e4b6208eb92ac893 CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt deleted in 4dcaef65ca9 (Bug 37993: Remove edi_ean page) and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt left in tree. error: could not apply 4dcaef65ca9... Bug 37993: Remove edi_ean page 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 4dcaef65ca9. (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) Changes to be committed: deleted: acqui/edi_ean.pl Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) deleted by them: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt kohadev-koha@kohadevbox:koha(24.05.x|CHERRY-PICKING)$ ---- Many thanks in advance. -- You are receiving this mail because: You are watching all bug changes.