http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11211
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #19 from Katrin Fischer <[email protected]> --- Jesse, did you rebase on a current master branch? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11211 - Move calculation code out of C4::Calendar Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt t/db_dependent/Calendar.t tools/calendar.pl Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 11211 - Move calculation code out of C4::Calendar The copy of the patch that failed is found in: /home/katrin/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-11211---Move-calculation-code-out-of-C4Calenda-ieK16X.patch -- 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/
