[Koha-bugs] [Bug 19784] Adapt /v1/patrons to new naming guidelines

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19784

--- Comment #12 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Same for me, I have applied the dependencies 16330 and 19686 (both apply
cleanly) - but this one gives me a lot of trouble.

I feel like we should wait for this patch to QA the dependencies - probably
needs an update now too with the discussion at the last meeting / RFC on the
wiki?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16330: Add routes to add, update and delete patrons
Using index info to reconstruct a base tree...
M       Koha/Exceptions.pm
M       Koha/Patron.pm
A       Koha/REST/V1/Patron.pm
M       api/v1/swagger/definitions/patron.json
M       api/v1/swagger/paths/patrons.json
M       t/db_dependent/Koha/Patrons.t
M       t/db_dependent/api/v1/patrons.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/api/v1/patrons.t
CONFLICT (content): Merge conflict in t/db_dependent/api/v1/patrons.t
Auto-merging t/db_dependent/Koha/Patrons.t
CONFLICT (content): Merge conflict in t/db_dependent/Koha/Patrons.t
Auto-merging api/v1/swagger/paths/patrons.json
CONFLICT (content): Merge conflict in api/v1/swagger/paths/patrons.json
Auto-merging Koha/SMS/Provider.pm
CONFLICT (content): Merge conflict in Koha/SMS/Provider.pm
Auto-merging Koha/Patron.pm
CONFLICT (content): Merge conflict in Koha/Patron.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 16330: Add routes to add, update and delete patrons
The copy of the patch that failed is found in:
   /home/vagrant/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-16330-Add-routes-to-add-update-and-delete-patr-hbLRSU.patch

-- 
You are receiving this mail because:
You are watching all bug changes.