Closed tokisuno closed 4 months ago
Any advice?
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
.
git add -u
and git commit -m '<some message to describe the change>'
in the directory ~/.oh-my-bash
.git stash
in the directory ~/.oh-my-bash
.git reset --hard
in the directory ~/.oh-my-bash
.