Separate git branches with different .gitignores for production and development

Question

What i'm trying to achieve is to have 1 repository on bitbucket, with 2 separate branches, 1 for development and 1 for production.

Lets say I have a repository which has the following files

public_html
   - node_modules
   - package.json
   - scss
   - mynotes.txt
   - style.css

I need to be able to push all of these files (except the node modules) up to bitbucket so other developers can work on the repo.

I also need to be able to have a separate .gitignore which ignores all files that are not needed for production.

So lets say I have the full development on my local machine which .gitignore looks like this

node_modules
mynotes.txt

And a separate production branch which .gitignore looks like this

node_modules
mynotes.txt
sass
package.json

I then start editing the sass files, which generate a new style.css file and push all of my changes up to the repo.

I then want to ssh into my server, and do a git pull on the production version, but the production version only pulls the style.css file thats been changed, not any of the other files.

Basically what i'm trying to achieve is both production and development being fed off 1 repository. But being able to pull down different files based on different .gitignores.

Sorry if this sounds confusing, its quite hard to explain!

Are you pushing node_modules to your version control?

Mark
– Mark

2018-10-19 11:45:10 +00:00
Commented Oct 19, 2018 at 11:45 — Mark
– Mark, Commented Oct 19, 2018 at 11:45
No, i never want the node_modules folder to go up

S_R
– S_R

2018-10-19 11:45:37 +00:00
Commented Oct 19, 2018 at 11:45 — S_R
– S_R, Commented Oct 19, 2018 at 11:45

eftshift0 · Accepted Answer · 2018-10-19 12:43:00Z

1

At plain sight, it can't be done. You can't just tell git "hey.... Pull from that other branch.... But only this and that file, not the others". If you want to try something like that you might have to use a third branch where you keep changes for those file so that you can easily pull from it to production without having changes in the flies you do 't want to carry into production.

answered Oct 19, 2018 at 12:43

eftshift0

31.5k5 gold badges55 silver badges78 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Separate git branches with different .gitignores for production and development

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related