Updating Oh My Zsh issues
ljci opened this issue · comments
Describe the bug
Auto-merging README.md
Auto-merging plugins/git-prompt/README.md
Auto-merging plugins/laravel/README.md
CONFLICT (content): Merge conflict in plugins/laravel/README.md
Auto-merging plugins/macos/README.md
error: could not apply 68f32c2... update
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 68f32c2... update
There was an error updating. Try again later?
plugins/laravel/README.md: needs merge
error: you need to resolve your current index first
Steps to reproduce
omz update
Expected behavior
it should update without any errors
Screenshots and recordings
OS / Linux distribution
macOS14.4.1
Zsh version
5.9
Terminal emulator
iterm2
If using WSL on Windows, which version of WSL
None
Additional context
No response
Hello, this error message means there are git conflicts within the OMZ folder, perhaps due to code changes you have made yourself. If you don't have anything of value or changes you want to keep, you can remove them by doing the commands below:
cd "$ZSH"
git status && git diff # CHECK THE GIT CONFLICT CHANGESIf everything looks right, or you're unaware of any changes done, just run:
cd "$ZSH"
git reset --hard HEAD # THIS WILL REMOVE ALL CHANGESThank you!