> So, if you're getting prompted, it's not just because there's a change to review, it's because there's a merge to review, and therefore it's because there was

> So, if you're getting prompted, it's not just because there's a change to review, it's because there's a merge to review, and therefore it's because there was a local modification, and therefore clearly either you or some other sysadmin did in fact edit that file. That's the way it should be, but while upgrading Debian I have very often seen prompts for files that were never touched locally.