问题
I keep getting this error:
error: Your local changes to the following files would be overwritten by merge:
.gitignore
How do I make it ignore the .gitignore file in my HOME directory?
My .gitignore looks like this and is being ignored:
# Can also ignore all directories and files in a directory.
app/config/**
app/config/**/*
plugins/**
vendors/shells/**/*
回答1:
Don't ignore it.
But commit it. There is no reason not to save this file.
If you commit it and then merge, the merge will (probably correctly) add your rules and the received ones.
来源：https://stackoverflow.com/questions/10750351/git-hub-gitignore-error