travis ci - Different configs in each git branch -

i have 2 git branches: dev , master

i'm using travis ci builds , testing , need have different .travis.yml , config.yml.enc (encrypted config file) each branch/environment.

how merge changes dev->master without merging .travis.yml , config.yml.enc files?

you have multiple options here (on master branch):

you can either run:

git merge --no-commit dev  git checkout .travis.yml  git checkout config.yml.end  git commit -m "merge dev master"

this merge files revert 2 files last master commit.

or can run (if commit history setup way):

git cherry-pick commit_hash

adding commits files not modified.

O9