Merge conflict in .gitignore Auto-merging .gitignore Automatic merge failed; fix conflicts and then commit the result. code example

$ git status

$ git add .

$ git commit -a "Comment"