A description of the automatic conflict resolution system I built at Hockeystick.
A supplement to the official MSBuild documentation where I provide detailed documentation of the syntax and semantics of variable expansion expressions in MSBuild files.