What do you want to save?
Add Code snippet
New code examples
-
Shell/Bash 2022-01-25 01:55:43
> 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' Add solution