Auto-merging .eslintcache CONFLICT (content): Merge conflict in .eslintcache Automatic merge failed; fix conflicts and then commit the result. code example
Example: git Automatic merge failed; fix conflicts and then commit the result
$ git status
$ git add .
$ git commit -a "Comment"