On Sat Feb 28 18:28:49 2026 +0000, Craig Schulstad wrote:
Fabian, I've been getting return messages of commit conflicts for which I could not see what it was conflicting with. In the last couple of days, I did make some tweaks to loader.c that seem to comprehensively find and load all of the resources, whether or not they are language specific. Today, I've been reviewing the source code for loader.c on my Gitlab branch and replacing tabbed indentations with spaces and desired in the FAQ and guidelines where the code was displaying unusual indentations to see if that resolves the issue. I will admit, I am a bit lost in the process right now. Regards, Craig Wine's CI demands that all commits compile, not just the latest. You'll have to flatten them and force push. (CI also requires a strictly linear history, you'll need to rebase and force push to delete that merge commit.)
Though I do agree the errors are rather cryptic. Especially with merges nearby. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_130839