https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393
--- Comment #5 from Mason James <[email protected]> --- (In reply to Dilan Johnpullé from comment #3) > Attempted to sign off but patch fails to apply. The following is my devbox > terminal output: > > vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 20393 > Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files > hi Dilan the patch applies ok for me, against commit e5d5038 (bz-20531) i'm guessing your repo wasn't set to the HEAD of the 'master' branch, before applying try the following... $ git fetch origin master $ git reset --hard origin/master then... $ git bz apply -s 20393 Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files 73392 - Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files ..success :0) $ git log --oneline | head -n 1 bb7e1b7 Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
