http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9303 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #62 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Kyle, could you please rebase? Sorry it took me so long to get back to this. I fixed a conflict in the third patch, but then there is another on the last, that I can't resolve: Applying: Bug 9303 [QA Followup] - Set AUTO_INCREMENT value for issues.issue_id Applying: Bug 9303 [QA Followup 2] - Undo changes to GetReserve Applying: Bug 9303 [QA Followup 3] - Add borrowerRelationship syspref check Applying: Bug 9303 [QA Followup 4] - Syspref the feature for staff fatal: sha1 information is lacking or useless (installer/data/mysql/updatedatabase.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 9303 [QA Followup 4] - Syspref the feature for staff The copy of the patch that failed is found in: /home/katrin/kohaclone/.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-9303-QA-Followup-4---Syspref-the-feature-for-s-hwC6Eh.patch -- You are receiving this mail because: You are watching all bug changes.