Thanks to Gaelen’s change in #681 I’ve added a similar change message to the conflict markers, e.g.,
>>>>>>> 1 [2OTFC3VB Fix: overly long loadscreen hints caused crashes when displayed in log. Maximum loadscreen length is now 190 (was 256).]
CHAR16 szName[190];
======= 1 [HL5Q3MEP Merged from revision: 6773]
CHAR16 szName[190];
<<<<<<< 1
Excellent idea! It conflicted with something I had done in parallel to improve conflicts in another direction. We have much nicer conflicts now, thanks!
pmeunier closed this discussion on February 22, 2023
Thanks to Gaelen’s change in #681 I’ve added a similar change message to the conflict markers, e.g.,