https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21159
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #47 from [email protected] --- Bug 21159 - Update item shelving location (952$c) on checkout 139097 - Bug 21159: Database changes 139107 - Bug 21159: Template and yaml changes 139109 - Bug 21159: Update item location on checkout 139220 - Bug 21159: (follow-up) Removing tab spaces Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21159: Database changes .git/rebase-apply/patch:21: trailing whitespace. warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M installer/data/mysql/mandatory/sysprefs.sql .git/rebase-apply/patch:21: trailing whitespace. warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 21159: Database changes 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-21159-Database-changes-9yBvZ6.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/
