https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36565
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #22 from Katrin Fischer <[email protected]> --- I fixed the first conflict, but got stuck on the second - can you please rebase? Applying: Bug 36565: Bookings API docs fixes (bug 29002 follow-up) Applying: Bug 36565: ILL requests API docs fixes (bug 22440 follow-up) Using index info to reconstruct a base tree... M api/v1/swagger/paths/ill_requests.yaml Falling back to patching base and 3-way merge... Auto-merging api/v1/swagger/paths/ill_requests.yaml Applying: Bug 36565: Biblio merge API docs fixes (bug 33036 follow-up) Applying: Bug 36565: Preservation module API docs fixes (bug 30708 follow-up) Applying: Bug 36565: EDI files API docs fixes (bug 30070 follow-up) error: sha1 information is lacking or useless (api/v1/swagger/swagger.yaml). error: could not build fake ancestor Patch failed at 0001 Bug 36565: EDI files API docs fixes (bug 30070 follow-up) 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-36565-EDI-files-API-docs-fixes-bug-30070-follo-dncuei9u.patch -- 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/
