如何合并远程分支并忽略配置设置？ [英] How to merge the remote branch and ignore the config setting?

问题描述

我正在开发一个cms项目并使用一个托管在github上的开源cms，我怎样才能在不覆盖我的本地设置的情况下远程获取最新的提交到我的工作副本？例如我的数据库设置等？

解决方案

我总是推荐一个以获取更多详细信息。

I working on a cms project and 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屋！