https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=40813
--- Comment #19 from Chris Mathevet <[email protected]> --- (In reply to Owen Leonard from comment #18) > I don't know why this keeps getting set to "Patch doesn't apply." It applies > fine for me! The error I get : sha1 missing or unusable 📋 Bug 40813 - Add ability to embed page start and end timing • 192167 - Bug 40813: Add ability to embed page start and end timing • 192168 - Bug 40813: Move timings to existing footer • 192169 - Bug 40813: (follow-up) Add some CSS, udpate navbar structure • 192170 - Bug 40813: (follow-up) Add milliseconds Apply? [(y)es, (n)o, (i)nteractive] y Preparing 4 patch(es): ✓ Prepared 4 patch(es) Applying 4 patch(es): ✓ [1/4] Applied Bug 40813: Add ability to embed page start and end timing ✓ [2/4] Applied Bug 40813: Move timings to existing footer Patch application failed for attachment 192169 - Bug 40813: (follow-up) Add some CSS, udpate navbar structure Patches left in /tmp/s29YgYccEu for manual application if needed To resolve: 1. Fix conflicts (use 'git mergetool' or edit files manually) 2. Stage resolved files with 'git add' 3. Continue with 'git bz apply --continue' or 'git am --continue' 4. Or skip this patch with 'git bz apply --skip' 5. Or abort with 'git bz apply --abort' Error: Apply failed: Git command (git am -3 /tmp/s29YgYccEu/0003-192169.patch) failed: erreur : l'information de sha1 est manquante ou inutilisable (C4/Auth.pm). erreur : could not build fake ancestor -- 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/
