M
M
Marellz2019-05-28 21:40:11
git
Marellz, 2019-05-28 21:40:11

How to properly store non-opensource features for a project?

Good afternoon.
There is an abstract OpenSource-project.
It has a commercial fork that includes features that should not be available in OpenSource. The fork is, of course, based on OpenSource code.
The code is written by one person, in the long run it can be a small (2-5 people) team.
What is the correct way to store these two codebases?
Should it be two separate repositories? How, then, to remember to commit common features both there and there, and not to commit commercial features in an open source repo?
Should it be two different branches in the same repository? How then to separate the prod, master and feature branches? How to confuse them?
Any other options?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
I
Ivan Shumov, 2019-05-28
@inoise

Gitflow, for example. Don't forget about tags and cherry pick. Well, to make rules like in the master only through merge request to take only a certain code. Don't forget the documentation and Readme.md

A
Andrey, 2019-05-28
@VladimirAndreev

As an option - 2 repos, the commercial one depends on open source

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question