14 Sep
2023
14 Sep
'23
5:30 p.m.
On Thu Sep 14 17:30:09 2023 +0000, Zebediah Figura wrote:
This will need a trivial rebase after 324 is committed. 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?
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/321#note_45364