Code

merge-recursive: When we detect we can skip an update, actually skip it