https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21005
Dilan Johnpullé <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Dilan Johnpullé <[email protected]> --- Error results when applying patch: vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 21005 Bug 21005 - Missing row/column defaults cause unexpected results in report wizards 77644 - Bug 21005: Missing row/column defaults cause unexpected results in report wizards Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21005: Missing row/column defaults cause unexpected results in report wizards Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt Failed to merge in the changes. Patch failed at 0001 Bug 21005: Missing row/column defaults cause unexpected results in report wizards The copy of the patch that failed is found in: /home/vagrant/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-21005-Missing-rowcolumn-defaults-cause-unexpec-XprggD.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/
