Oh My Zsh automatic updates and local core modifications

Oh My Zsh manages framework updates via a git-based mechanism triggered by the ZSH_UPDATE_INTERVAL setting. This process pulls the latest changes from the official repository to ensure the local installation remains current.

A design uncertainty exists when users make direct modifications to files within the core framework directory rather than using custom plugins or the .zshrc file. If a remote update modifies a line that has been locally altered, the automatic update process may encounter a git merge conflict.

Given that these updates often trigger silently in the background upon shell initialization, the behavior for resolving these conflicts remains unclear.

• How does the framework handle merge conflicts during an automated update sequence?
• Is there a mechanism to notify the user of a failed automatic update due to local core modifications?