Return to Question

These requisites complicate our work but, fortunately, we can assume some simplifications. For example, the plugins are frequently updated bi only one programmer at a time. It is very rare to have two or more features being added to a plugin at the same time.

These requisites complicate our work but, fortunately, we can assume some simplifications. For example, the plugins are frequently updated by only one programmer at a time. It is very rare to have two or more features being added to a plugin at the same time.

My question is focused in my specific problem (which involves Liferay) but I hope it can be useful for anyone who needs to maintain various versions of a same project on git.

I work on a company which writes a lot of plugins for Liferay. These plugins (portlets, themes etc.) are usually reusable and, of course, should be updated for new versions of the portal.

Note: My question is focused in my specific problem (which involves Liferay) but I hope it can be useful for anyone who needs to maintain various versions of a same project on git.

I work on a company which writes a lot of plugins for Liferay Portal. These plugins (portlets, themes etc.) are usually reusable and, of course, should be updated for new versions of the portal.

1. What would be a better model? My proposal? My friend's model? The now traditional Vincent Driessen system?
2. What other branching model would you suggest?
3. If you think my model is bad, why do you think so? I would love to learn what are the drawbacks and blind spots.

1. What would be the best model? My proposal? My friend's model? The now traditional Vincent Driessen system?
2. What other branching model would you suggest?
3. If you think my model is bad, why do you think so? I would love to learn what are the drawbacks and blind spots.