https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41190
--- Comment #6 from Christopher Brannon <[email protected]> --- Tried signing off and got this via sandbox: Saved working directory and index state WIP on main: 3f2987eb19 Koha 25.11.00 is here! /bin/sh: 1: Brannon: not found fatal: It looks like 'git am' is in progress. Cannot rebase. On branch main Your branch is up to date with 'origin/main'. You are in the middle of an am session. (fix conflicts and then run "git am --continue") (use "git am --skip" to skip this patch) (use "git am --abort" to restore the original branch) Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) [31mmodified: koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt[m no changes added to commit (use "git add" and/or "git commit -a") Dropped refs/stash@{0} (8322473a76a0270c3b5e3889486191acf550476e) -- 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/
