https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17314
--- Comment #41 from Arthur Suzuki <arthur.suz...@biblibre.com> --- Hi Tomas, Since you've been doing most of the rework on this patch i thought maybe it would be best to have you as assignee. I've just tried to test it and maybe signoff (also a good reason for not being assignee myself) but failed to apply on current master. Kr, Arthur <pre> arthur@carl9000:~/repos/koha$ git bz apply 17314 Bug 17314 - Routes to create, list and delete a purchase suggestion 93761 - Bug 17314: Routes to handle purchase suggestions 93762 - Bug 17314: Migration from Swagger2 to OpenApi 93763 - Bug 17314: QA Followup 93764 - Bug 17314 : Added _to_model and _to_api methods and changed attirbutes naming 93765 - Bug 17314: (QA follow-up) Adjust spec Apply? [(y)es, (n)o, (i)nteractive] y Application de Bug 17314: Routes to handle purchase suggestions Utilisation de l'information de l'index pour reconstruire un arbre de base... M Koha/Patron.pm M api/v1/swagger/definitions.json M api/v1/swagger/parameters.json M api/v1/swagger/paths.json Retour à un patch de la base et fusion à 3 points... Fusion automatique de api/v1/swagger/paths.json CONFLIT (contenu) : Conflit de fusion dans api/v1/swagger/paths.json Fusion automatique de api/v1/swagger/parameters.json Fusion automatique de api/v1/swagger/definitions.json CONFLIT (contenu) : Conflit de fusion dans api/v1/swagger/definitions.json Fusion automatique de Koha/Patron.pm CONFLIT (contenu) : Conflit de fusion dans Koha/Patron.pm error: Échec d'intégration des modifications. le patch a échoué à 0001 Bug 17314: Routes to handle purchase suggestions astuce: Utilisez 'git am --show-current-patch' pour visualiser le patch en échec 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-17314-Routes-to-handle-purchase-suggestions-OvK0GF.patch arthur@carl9000:~/repos/koha$ </pre> -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/