For completeness sake, allow an abort of a pull
Also remove var file
Merge branch 'AbortPull'
If a destructive command, abort if there are any local changes
Merge branch 'LocalChangesFailure'