I tried it on Bug 23732. See auto_rebase-output attached. It errored on request.tt. But it still managed to commit. No conflict. After testing, the basic functionality of the patch still works. So that looked ok and I moved on with it. But now looking at the diff there was definitely an issue. 2024-10-28 version of the 1st patch: https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=173427&action=diff&collapsed=&headers=1&format=raw Same patch after auto rebase: https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=178886&action=diff&collapsed=&headers=1&format=raw 33.87 KB => 207.02 KB Doing a diff between the two diffs shows massive additional changes in request.tt And they aren't in a part changed by the original patch. (so I rolled back to the old patch in the ticket) And the error the script got is in those additional changes «input class="multi_hold_item_checkbox» and the following </td> This is not in the original patch. I would have expected the error that started it all to be in the actual patch. So maybe it didn't start it all here. ----------- Looking at other changes on Reserves.pm: 2024-10-28 version of the 1st patch: https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=173427&action=diff#a/C4/Reserves.pm_sec8 Same patch after auto_rebase: https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=178886&action=diff#a/C4/Reserves.pm_sec10 So now there are changes to sub _koha_notify_reserve and other subs after that. And they are removing things! All while they was no error reported in that file. So this plus the error on the <td> next to multi_hold_item_checkbox that is totally out of the original changes is suspicious.
Created attachment 178948 [details] auto_rebase-output.txt
Bug 23732 introduces stuff removed with bug 38714. +[% IF reserves_count >= Koha.Preference('maxreserves') %] + <span class="text-danger"> +[% ELSE %] + <span> +[% END %] + [% tx('{preference_name} preference:', { preference_name = '<em>maxreserves</em>' }) | $raw %] + <strong>[% Koha.Preference('maxreserves') | html %]</strong> +</span> So the problem is more about that it's not clear.
Because the error shows stuff not in the patch.