http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7647
Jared Camins-Esakov <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #5 from Jared Camins-Esakov <[email protected]> --- (In reply to comment #4) > nengard@kohavm:~/kohaclone$ git bz apply 7647 > Bug 7647 - Checkout History Sort > > patch > Apply? [yn] y > > Applying: bug_7647: Table sorter on issue history > error: patch failed: > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt:1 > error: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt: > patch does not apply > Patch failed at 0001 bug_7647: Table sorter on issue history > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > Patch left in /tmp/patch-v09mXq.patch > nengard@kohavm:~/kohaclone$ Don't forget to try git am -3. The patch actually applies fine with three-way merge. If you look at the last few lines, it actually gives you a hint of what to do next. You run the following two commands: git am --abort git am -3iu /tmp/patch-v09mXq.patch There's also a patched version of git-bz that takes care of that for you which you could download (I don't recall exactly wherefrom). -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ 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/
