/Shell/Bash/> git checkout -q error: you need to resolve your current index first

> git checkout -q error: you need to resolve your current index first

>git checkout -q error: you need to resolve your current index first

# CONFLICT (content): Merge conflict in path/to/file

# open the file in an editor of your choice
$ vim /path/to/file_with_conflict

# repeat for every file that has a conflict and then

$ git commit -a -m 'commit message'

Source: unfuddle.com

Similar codes

0 vote248 views1 answer
Automator save pdf to downloads
Shell/Bash
21 votes216 views6 answers
Angular new component
Shell/Bash
21 votes232 views3 answers
How to delete a non empty directory in linux
Shell/Bash
0 vote211 views1 answer
Linux check current umask
Shell/Bash
1 vote218 views1 answer
Sudo apt update ignore gpg signature
Shell/Bash
8 votes210 views4 answers
How to copy everything in a file with sudo nano
Shell/Bash
5 votes214 views4 answers
Conda update with environment from yml file
Shell/Bash
0 vote225 views1 answer
Tmux set color
Shell/Bash
0 vote219 views1 answer
How to save powershell config
Shell/Bash
0 vote219 views1 answer
Nohup run node/npm
Shell/Bash