Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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/**/*
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.