https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40647
Anneli Österman <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #3 from Anneli Österman <[email protected]> --- I asked in Mattermost (https://chat.koha-community.org/koha-community/pl/wweqmk9ap7ys3miu67kwjdhziy) about the error I got and Katrin recommended to set this bug as Patch does not apply. The error while trying to sign of was: Saved working directory and index state WIP on main: 8d31c2e067 Bug 40608: (QA follow-up) Delete notice in test, adjust about.tt /bin/sh: 1: Ãsterman: 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/reports/reports-home.tt[m no changes added to commit (use "git add" and/or "git commit -a") Dropped refs/stash@{0} (815c81d5a813e5b61b1246fa5dcffbd86f9fad4c) -- You are receiving this mail because: You are the assignee for the bug. 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/
