I organize my Git projects based on the article A successful Git branching model. The problem is that I don't know how to handle the following case:
develop: working on a major app redesign (taking ~6 months)
master: current production version
However, because we access paid customizations (from enterprise customers), sometimes a customer requests, for example, a new report to be added.
That's technically not a
hotfix, but a
features should not branch off from
master or a
release branch. Even more, if the feature is big enough, it could be a complete difference
release. So, while
master has v1 and
develop has v2, where do I work for features that go to v1.1, v1.2, and so on?
What I currently do is, branch a
master and merge back to
develop. Is there any workflow model that's more appropriate/organized?