error: you need to resolve your current index first .gitignore: needs merge code example Example: error: you need to resolve your current index first git git reset --merge