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

Question

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 ?

score 2 · Accepted Answer · edited May 23 '17 at 12:25

2

I always recommend a filter driver with:

enter image description here

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.

edited May 23 '17 at 12:25

Community

1
1

answered Jun 04 '11 at 10:15

VonC

1,262,500
529
4,410
5,250

but i got no control to setup the template file ? since the cms is clone over from github ? – Knight Jun 04 '11 at 12:52
@Knight: the template and value files are additional files you can add to the repo. You need to have a script able to detect the current environment in which the repo is cloned in order to build the right setting files. – VonC Jun 04 '11 at 16:41

score 1 · Answer 2 · answered Jun 04 '11 at 21:52

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.

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

2 Answers2

Linked