> The answer is maybe to auto merge what has not changed locally?

Yup sysmerge(8) does this on OpenBSD. Not sure if other BSDs have similar mechanisms, from the article I would guess not.