Skip file or prompt if there are new modifications in git

[mauro-oto]

Either prompt to overwrite/skip/resolve conflicts for the file, or skip the file entirely if there are differences between the last commit and the last modification.