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’d like to have a git repository with a branch for development and a branch for deployment. I have several configuration and database files that my project needs. I want the deployment branch not to have any configuration or database files for my project, but I want to keep versions of those files in my development branch in order to be able to test. Is there any way, when merging the development branch into the deployment branch, to have the merge process ignore those files?
From the pro git book: http://git-scm.com/book/en/Customizing-Git-Git-Attributes#Merge-Strategies
On your branch
You can either gitignore (man gitignore) or keep .gitattributes locally only in your branch.