I'm in charge of deploying a versioning system here in the company. However I am in doubt between SVN and Git.
My question is if git has something that does the same thing as lock
of SVN, that is, it blocks commit
of some particular files for given branch
.
What I would have is '3 branchs' fixed:
- Master: where the main application is.
- Homologation: where the customer is waiting to test and approve.
- Test: where the "final" version of the program version is for intensive testing by teams.
Then you have the developments.
However in these 3 branchs, they have some configuration files (such as database, FTP, etc.) that should not pass to the other branch
.
So I would like, to avoid human errors, to block merge
/% with% of these files between the branches and I would like to know if git has (or would have any others that allow).