https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37344
Roman Dolny <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #19 from Roman Dolny <[email protected]> --- Problem when applying a patch (p. 8): kohadev-koha@kohadevbox:koha(bug_37344)$ git bz apply 37344 Bug 37344 - Patrons with cancelled discharge are seen as discharged when suspended due to overdue 179826 - Bug 37344: Add a real solution for discharge cancellation 179827 - Bug 37344: (follow-up) to be squashed 179828 - Bug 37344: (follow-up) to be squashed 181709 - Bug 37344: (follow-up) Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 37344: Add a real solution for discharge cancellation Using index info to reconstruct a base tree... M Koha/Patron/Discharge.pm M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt M members/discharge.pl Falling back to patching base and 3-way merge... Auto-merging members/discharge.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging Koha/Patron/Discharge.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 37344: Add a real solution for discharge cancellation hint: Use 'git am --show-current-patch=diff' to see the failed 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-37344-Add-a-real-solution-for-discharge-cancel-s5vjzos4.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
