Try to handle buffer/file modifications which conflict with VCS locking.