error:you need to resolve your current index first


solution: git reset –merge