Well, if there is a conflict it should automatically stash my changes or display a dialog about the conflict depending on preferences.