Parallel version control

Question

git

Situation: There is a code that includes a certain set of components, a framework, cms, modules for cms, templates, and so on. The code often overlaps and it is not always possible to separate it.

It is necessary to be able to conduct independent version control of individual files / folders, so that in which case it would be possible to unload only the necessary one with one click.

So far, I have outlined such a crutch in my mind , but it will not be very convenient to manage all this.

Perhaps there is some kind of ready-made solution?

Answer 1

Found a solution github.com/colinmollenhour/modman , implements almost what I wanted)

Answer 2

I'm sure branching and labeling will help you.
If you are using git and are not yet familiar with branching, then here is a good article about using tags as well .
If you have any difficulties, I will be happy to advise, write in a personal.

Answer 3

Maybe you don’t need Version Control, but Release management ... (then the version control system has nothing to do with it)

Answer 4

I'm interested in about the same, but for the "heterogeneous" structure of repositories (svn + git). You can use git submodules. I really did not understand what "common root" means in your version. It seems to me that your option is git submodules.

Answer 5

It won't work, I thought. You have the same files in the general and small repository may intersect.
For good, you need to turn your repositories, reorganize them. Otherwise, all sorts of trouble awaits you, I'm afraid.