14 Sep
2023
14 Sep
'23
6:04 p.m.
OK, I have it fixed on my local copy, but I'm not sure on the protocol for MRs with conflict-fixing commits. What should I do there?
Just rebase and resend. Though we are close to release so it wouldn't surprise me if this is delayed until after 1.9. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/321#note_45368