How to merge the remote branch and ignore the config setting?

I working on a cms project an开发者_Go百科d using a open source cms that hosted on github , how can I fetch the latest commit remotely to my working copy without overwrite some of my local setting ? example my database setting etc ?

I always recommend a filter driver with:

• a template for those setting files (versioned in Git)
• some files with the right values depending on the environment
• a script able to build the actual setting files (as a 'smudge' script)

See "How to keep different content of one file in my local and github repository?" for more details.

It's usually best to remove those files from the repo and add them to your .gitignore. You can then make the app gracefully handle missing configs by generating a default file. Failing that, you can provide an "example" config file for the user to copy and edit.