https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19166
Victor Grousset/tuxayo <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] | |m --- Comment #23 from Victor Grousset/tuxayo <[email protected]> --- conflicts ~/d/koha ❯❯❯ git bz apply 19166 Bug 19166 - Add the ability to add adjustments to an invoice 70413 - Bug 19166 - Database changes 70414 - Bug 19166 - Add the ability to add adjustments to an invoice 70415 - Bug 19166: DO NOT PUSH - Schema updates 70416 - Bug 19166 - Unit tests for GetBudgetSpent and GetBudget ordered Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19166 - Database changes Using index info to reconstruct a base tree... M installer/data/mysql/kohastructure.sql Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/kohastructure.sql Applying: Bug 19166 - Add the ability to add adjustments to an invoice Using index info to reconstruct a base tree... M acqui/invoice.pl M acqui/ordered.pl M acqui/spent.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt Auto-merging acqui/spent.pl Auto-merging acqui/ordered.pl Auto-merging acqui/invoice.pl Applying: Bug 19166: DO NOT PUSH - Schema updates Using index info to reconstruct a base tree... M Koha/Schema/Result/Aqbudget.pm M Koha/Schema/Result/Aqinvoice.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/Aqinvoice.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Aqinvoice.pm Auto-merging Koha/Schema/Result/Aqbudget.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Aqbudget.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 19166: DO NOT PUSH - Schema updates The copy of the patch that failed is found in: .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-19166-DO-NOT-PUSH---Schema-updates-Wq9yGZ.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/
