https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3150 --- Comment #92 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I tried to fix the conflict, but then I get: git bz apply --continue Applying: Bug 3150: Move emails for sending cart and list contents to notices Applying: Bug 3150: (follow-up) HTML filtering TT notices and removing old files Applying: Bug 3150: (follow-up) Reformat notices, don't send if no sender email Applying: Bug 3150: (follow-up) Add missing bracket Applying: Bug 3150: (follow-up) Fixing errors and notices error: sha1 information is lacking or useless (installer/data/mysql/en/mandatory/sample_notices.yml). error: could not build fake ancestor Patch failed at 0001 Bug 3150: (follow-up) Fixing errors and notices 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-3150-follow-up-Fixing-errors-and-notices-m9LiH9.patch Aleisha, can you please have a look? -- You are receiving this mail because: You are watching all bug changes.