Question

I’m using git to develop a project and each machine may need a slightly different .htaccess file. I wonder if there’s any technique to handle versioning this file without having a separate one on each machine?

Basically I have something like that in mind (pseudo-code):

<MachineX>
    RewriteBase /somepath/ 
</MachineX>

<MachineY>
    RewriteBase /anotherpath/ 
</MachineY>

<Production>
    RewriteBase /prodpath/ 
</Production>

Basically, each machine can have their custom code in .htaccess if needed. Any suggestion?

Answer 1

One possibility is to have a template .htaccess file in your main branch, say master.

Then you create a branch from master for each machine and commit modifications to this file on this specific branch.

And when you want to integrate changes from master into that branch, just switch to it and merge with master.