Lead with what changed for the reader, in their words.
Merge early, release when ready, and keep a switch for when it goes wrong.