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