Separate files in Git

I’m trying to keep my static files in a separate branch so that I can keep them from merging into my master brach (on Heroku, your application’s slug needs to stay small). I don’t want to ignore my static files, because I want to keep them inside my “devel” branch.

Ideally I’d like to keep test.db blank and my entire public folder blank in the master branch.

  • Use GIT fork / branches
  • Git add branch on one single directory?
  • Unable to understand Git branch, merge and rebase
  • Git commits are duplicated in the same branch after doing a rebase
  • Git Merge and Fixing Mixed Spaces and Tabs with two Branches
  • Relationship between n git branches
  • So, can I create an ‘overlay’ onto a branch? Can I prevent certain files/directories from merging into my master branch?

  • Git command “add -p” on all files
  • Git: Checkout all files except one
  • What's the best way to edit GitHub's
  • Posh-Git and Posh-Hg Together?
  • Reset or revert a specific file to a specific revision using Git?
  • x86 assembly instruction execution count
  • 2 Solutions collect form web for “Separate files in Git”

    You could define those same static files on your master branch but:

    • empty
    • witw a gitattributes files specifying you always want to keep your local version (i.e. empty) when merging those files

    Since that .gitattribute would not be define on other branches, the merge of those files would proceed normally.

    The idea is to define a .gitattributes file in the directory of those static files on the master branch with the following content:

    myStaticFile1 merge=keepMine
    myStaticFile2 merge=keepMine
    myStaticFile3 merge=keepMine

    Those three files will always keep their local content (which is empty on master) when merging to master.

    You will have to define a merge driver (here called “keepmine”). See the linked question for that script.

    Add the files to .gitignore in master. When you checkout devel, .gitignore will change and won’t ignore them anymore. (Note that if you run git clean -x, the files will be overwritten.)

    Git Baby is a git and github fan, let's start git clone.