Comments (1)
The directory ~/.oh-my-bash
is a git repository, and the updating is performed by git pull
. A conflict can happen if you have any changes in ~/.oh-my-bash
. This time, you seem to have uncommitted changes. As the red text explains, you need to commit, stash, or discard the uncommitted changes.
You can go into the directory by cd ~/.oh-my-bash
and run git status
to see the current status. To check the changes, run git diff
. To check the staged changes, run git diff --cached
.
- To commit all the uncommitted changes, for example, you can run
git add -u
andgit commit -m '<some message to describe the change>'
in the directory~/.oh-my-bash
. - To stash the changes to later apply them, you can run
git stash
in the directory~/.oh-my-bash
. - To discard the uncommitted changes and revert them to the original Oh My Bash, you can run
git reset --hard
in the directory~/.oh-my-bash
.
from oh-my-bash.
Related Issues (20)
- problems with cd on sshfs mounted directory with git repositories HOT 2
- Problems with tmux > detaching or killing session HOT 1
- Allow for a way to not alter bash files directly, but to make changes that can be sourced HOT 3
- Robby russell theme issue HOT 2
- .bashrc is running twice when SSH into remote server HOT 4
- How to use "U+e0b6" () at the beginning of the prompt? HOT 1
- How to autocomplete the files with lsd instead of ls? HOT 1
- sudo: _omb_util_alias_init_mv: command not found HOT 5
- how to show the directory where the command was executed HOT 7
- Custom git completion does not work as expected HOT 12
- Completion broken when sourcing file HOT 13
- Theme not being applied HOT 2
- Sin soporte para venv-conda
- Modifying git-prompt.sh does not take effect HOT 1
- lambda theme for oh my bash HOT 1
- The `DISABLE_UPDATE_PROMPT=true` on `~/.bashrc` doesn't work. HOT 4
- Theme: wanelo throws error HOT 1
- ssh completion doesn't include global ssh hosts HOT 1
- How to change time from 12H to 24H. HOT 3
- Is there anyway to use this when my .bashrc is a symlink to a global .bashrc in my org?
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 oh-my-bash.