It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

How to prevent a file from being committed to one branch but included in the commit for another?

We have a cert file that belongs in our development area and we don't want to push it up to our production area.  We have separate branches for each area.  There is actually a cert file also for the production area.  So every time we commit from our development area to our production are the dev cert gets included in the production area and it causes issues.  Is there a way to have the dev cert belong to the dev branches (we have a dev, qa, and staging branch for each environment) and the prod cert belong only to the production branch ?

Any ideas or suggestions would be greatly appreciated!

1 answer

0 votes
Mike Corsaro Atlassian Team May 15, 2018

Hello! This should be possible using .gitattributes. I assume your workflow is to merge from dev to prod? If so, you can use something like this to achieve that.

We actually have three development environments that use the same sandbox SSL cert (required by a third-party API) and it is only one file that needs to remain on those servers.  A different SSL cert is used by the production version of the API.  THe cert shouldn't change very frequently.  We simply want to keep the cert files in the right location but don't want to commit them every time.  Right now we have to commit the prod cert separately to the repo after releasing code in order to keep the API working, because the sandbox version of the cert keeps getting committed with pushes to the dev branches.  Don't know how to fix this.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,989 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you