"reset to theirs" — don't reinvent the wheel, use merge -s theirs <latest remote commit>  (it is a little bit low-level (merge will just ignore it, because this commit already merged into local), but, yep!, works)

Thanks a lot to Kirill Likhodedov, our git guru.