https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38659
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #11 from Alex Buckley <[email protected]> --- Hi Lucas, When I cherry-pick this patch from 24.11.x to 24.05.x it conflicts (see below): --- kohadev-koha@kohadevbox:koha(24.05.x)$ git cherry-pick 65c1d6ccf8d76e919db2fb18977e4299dbb297b2 Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt error: could not apply 65c1d6ccf8d... Bug 38659: Fix select_manager function when there are no tabs 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 65c1d6ccf8d. (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: koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt Untracked files: --- Could you please attach a 24.05.x 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/
