.eslintcache: needs merge during checkout code example Example: git error needs merge git reset --merge