The Nest
Explore
438
The sound distributed version control system

#686 Show change messages in conflict markers

Closed on February 22, 2023
rohan on May 20, 2022

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
rohan added a change on May 20, 2022
show first line of change message in conflict markers
GQTC4TJABT3U6DDUBSILVUIGW2XHAHEDDT2QMJYLKT4ONSIV4PRQC
main
pmeunier on February 22, 2023

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