delta/redis.git - github.com: antirez/redis.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix commands.c build issue on merge (#10172)	yoav-steinberg	2022-01-25	1	-0/+6
	Set commands.c's merge driver to binary so when it conflicts during a merge git will leave the local version unmodified. This way our Makefile will rebuild it based on src/commands/.json before trying to compile it. Otherwise the file gets modified with merge conflict markers and gets the same timestamp as the .json files, so the Makefile doesn't attempt to rebuild it before compiling and we get a compilation error.