https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8214
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #124 from Katrin Fischer <[email protected]> --- I resolved a conflict in Biblio.t, but can't get this to apply on main getting stuck a few more patches down: kohadev-koha@kohadevbox:koha(main|AM 1/1)$ git add t/db_dependent/Koha/Biblio.t kohadev-koha@kohadevbox:koha(main|AM 1/1)$ git bz apply --continue 🅸 Continued with current patch 🅸 Continuing with 5 remaining patch(es)... Applying 5 patch(es): ✓ [1/5] Applied patch 210527 ✓ [2/5] Applied patch 210528 ✓ [3/5] Applied patch 210529 ✓ [4/5] Applied patch 210530 Patch application failed for attachment 210531 Patches left in /tmp/9JT3JdXmSE 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/9JT3JdXmSE/0020-210531.patch) failed: error: sha1 information is lacking or useless (Koha/Biblio.pm). error: could not build fake ancestor -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list -- [email protected] To unsubscribe send an email to [email protected] website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
