Open marcwieland95 opened 8 years ago
Run this inside enrol update command:
git update-index --assume-unchanged .enrolzsh_global
Sometimes this happens:
error: Your local changes to the following files would be overwritten by merge: enrolzsh.plugin.zsh
Please commit your changes or stash them before you merge.
Ignore or merge it directly