https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14806 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #11 from David Nind <david@davidnind.com> --- Patch no longer applies because of an issue with bug 18595: Applying: Bug 18595: Unit tests preparing for GetMessagingPreferences move Using index info to reconstruct a base tree... M t/db_dependent/Circulation.t M t/db_dependent/Reserves.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Reserves.t Auto-merging t/db_dependent/Circulation.t Applying: Bug 18595: Move C4::Members::Messaging::GetMessagingPreferences .git/rebase-apply/patch:146: trailing whitespace. This method defines how a user (or a default for a patron category) wants to get a certain .git/rebase-apply/patch:272: trailing whitespace. warning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... M C4/Circulation.pm M C4/Reserves.pm M circ/returns.pl M misc/cronjobs/advance_notices.pl .git/rebase-apply/patch:146: trailing whitespace. This method defines how a user (or a default for a patron category) wants to get a certain .git/rebase-apply/patch:272: trailing whitespace. warning: 2 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging misc/cronjobs/advance_notices.pl CONFLICT (content): Merge conflict in misc/cronjobs/advance_notices.pl Auto-merging circ/returns.pl Auto-merging C4/Reserves.pm Auto-merging C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 18595: Move C4::Members::Messaging::GetMessagingPreferences 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-18595-Move-C4MembersMessagingGetMessagingPrefe-TcECxc.patch Cannot apply cleanly patches from bug 18595. Everything will be left dirty. git bz apply --continue will not continue the process if patches from other bug reports need to be applied. -- You are receiving this mail because: You are watching all bug changes.