Comments (3)
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
from ohmyzsh.
Thank you!
from ohmyzsh.
Thanks, this worked for me! I had the same issue running omz update
, getting
➜ omz update
plugins/shell-proxy/ssh-proxy.py: needs merge
error: you need to resolve your current index first
I'm unaware of any changes I made to the plugin itself, so this may be a more common issue. Adding the error message for discoverability
from ohmyzsh.
Related Issues (20)
- omz_urlencode:45: pcre_exec() error [-10] HOT 1
- No space found between folder name and command in visual studio code HOT 1
- Support alacritty-direct $TERM in title() function
- Alias Arguments Not Being Recognized HOT 2
- Unexpected backslash ( \ ) when opening in vscode terminal HOT 1
- ohmyzsh/aws plugin aws profile not persisting across sessions HOT 1
- `omz plugin disable` breaks .zshrc file when disabling common substring HOT 10
- Minimal theme: prompt does not display information about git status HOT 1
- rsync-move has not delete directory. HOT 2
- fzf_setup_using_fzf:6: command not found: is-at-least HOT 2
- plugins/wd: update to v0.6.1
- plugins/wd: update to v0.6.1
- (eval):10: parse error near `^M' HOT 3
- Call out during install that you must copy from old .zshrc
- Interface Bug HOT 2
- [Plugin] Salt error command not found: python2 when cache autocomplete does not exist
- kubectl plugin completions not working for kj, kjx, ky
- Add FAQ for brew installation HOT 2
- omz update raises "upgrade.sh:186: bad pattern: ^[[31m" HOT 7
- plugins/wd: update to v0.7.0
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from ohmyzsh.