A
A
Alexey Verkhovtsev2017-12-28 13:26:51
git
Alexey Verkhovtsev, 2017-12-28 13:26:51

How to support older versions with Gitflow?

What if we have 2 releases in the master tagged 1.1.0 and 1.2.0
We support both versions and find bugs in both versions. Gitflow describes the process with single version support. That is, we need to create a hotfix-1.2.1 branch from the master and make corrections, and then pour it into the master again. But what if I need to make, for example, a fix for version 1.1.0? from what should I create a hostfix-1.1.1 branch? Of course, I can find a merge commit of the release-1.1.0 branch with the master branch and branch off from it, but what happens then? Where should I put these changes? To the release-1.1.0 branch? This is wrong, because the release is different, in the master? It’s also not true, because now there is version 1.2.0 (or if I have already fixed it, then 1.2.1), and also if I make corrections to version 1.1.0, then in addition to creating version 1.1.1, I also need to pour these changes into version 1.2.0 or not? But if this is the case, then version 1.2.0 should also change .. . And if we support 5, 10 versions, I'm confused in this process. That is, if everything goes linearly. We released release 1.2.0 and support only it, then yes, everything is cool, everything is clear, but if we support older versions, what to do. I hope I have described my questions in as much detail as possible. Thanks in advance

Answer the question

In order to leave comments, you need to log in

2 answer(s)
M
Maxim Moseychuk, 2017-12-28
@fshp

Hotfixes should be added to the support branch via cherry-pick.

D
dmitriy, 2017-12-28
@dmitriylanets

there are two options to support the old version or not
1. if not, then persuade you to upgrade, since the new version contains a bug fix (and not only this one)
2. if yes, then create a branch from 1.1.56 (the latest current version) of the old / 1.1 type. 56 and make corrections there too, understandable without tagging

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question