Re: [PATCH v4 0/5] MR8244: combase: Add RoFailFastWithErrorContextInternal2() stub.

[Alexandre Julliard (＠julliard)]

On Wed Jun 11 01:09:53 2025 +0000, Elizabeth Figura wrote:
> But the patch is going to be edited before committing anyway, whether
> the generated changes are included or not, so I don't see the issue?
> The generated files will be updated on commit, but if there's a conflict the MR won't apply cleanly. And in general I refrain from merging MRs that cause conflicts because that makes it too easy to screw something up.

So not including generated files is not a requirement, but it increases the chances that the MR can go in smoothly.

Of course it also depends on the file, conflicts are not very likely with `include/Makefile.in`, but are pretty much guaranteed with `ntsyscalls.h` or `server_protocol.h`.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8244#note_106208