Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Oh My Zsh issues #12361

Closed
ljcliu opened this issue Apr 17, 2024 · 2 comments
Closed

Updating Oh My Zsh issues #12361

ljcliu opened this issue Apr 17, 2024 · 2 comments
Labels
Area: updater Update subsystem Resolution: not our issue Issue or pull request not related to Oh My Zsh

Comments

@ljcliu
Copy link

ljcliu commented Apr 17, 2024

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

Screenshot 2024-04-17 at 9 45 59 AM

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

@mcornella
Copy link
Member

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 CHANGES

If everything looks right, or you're unaware of any changes done, just run:

cd "$ZSH"
git reset --hard HEAD # THIS WILL REMOVE ALL CHANGES

@mcornella mcornella added Resolution: not our issue Issue or pull request not related to Oh My Zsh Area: updater Update subsystem labels Apr 17, 2024
@ljcliu
Copy link
Author

ljcliu commented Apr 17, 2024

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: updater Update subsystem Resolution: not our issue Issue or pull request not related to Oh My Zsh
Projects
Status: Done
Development

No branches or pull requests

2 participants