https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15516 --- Comment #357 from David Cook <dcook@prosentient.com.au> --- (In reply to Victor Grousset/tuxayo from comment #353)

(In reply to David Cook from comment #351)

...

I can't guarantee that my last patches actually apply on master

Indeed lol :P

...

Patch failed at 0001 Bug 15516: Add ability to create hold groups from OPAC

I'm getting merge conflicts earlier now... Bug 15516 - Allow to place a hold on first available item from a group of titles 120643 - Bug 15516: Database and installer updates 120644 - Bug 15516: Relevant controller changes and tests 120645 - Bug 15516: Allow to reserve first available item from a group of titles 120646 - Bug 15516: Schema updates 120647 - Bug 15516: (follow-up) Add hold group message to holds queue 120648 - Bug 15516: (follow-up) Remove other holds in hold_group from holds_queue 120649 - Bug 15516: (follow-up) Fixes for qa tools 120651 - Bug 15516: (follow-up) Fixing file permissions and title elements order 121523 - Bug 15516: Fix shebang in hold-group.pl 121623 - Bug 15516: (follow-up) Count group holds always 122097 - Bug 15516: Fix hold groups for multi items for one bib 122102 - Bug 15516: Add ability to create hold groups from OPAC 122627 - Bug 15516: Show user's hold groups to user via OPAC Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15516: Database and installer updates Applying: Bug 15516: Relevant controller changes and tests Applying: Bug 15516: Allow to reserve first available item from a group of titles Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt M opac/opac-reserve.pl M reserve/placerequest.pl M reserve/request.pl Falling back to patching base and 3-way merge... Auto-merging reserve/request.pl Auto-merging reserve/placerequest.pl Auto-merging opac/opac-reserve.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 15516: Allow to reserve first available item from a group of titles -- You are receiving this mail because: You are watching all bug changes.