Rename immutable mode to something more descriptive.
Add specs around handling conflicts.
Add a new mode to only fail on conflicting files if they are cached.