On Mon, Jun 15, 2020 at 1:21 PM Matias N. <mat...@imap.cc> wrote: > > The fact the the release branch was merged does not impede to continue to add > commits to it. In any case, I would expect fixes to LTS releases to bump the > version number, so whenever a new minor version for that LTS version is to be > released and it is considered final (i.e. 9.2 if 9.x is LTS), it would be > merged and tagged. > > Or am I missing something? >
I am fairly sure you cannot do what you are asking and this is one of the points people bring up against the GitFlow workflow. Master cannot look like this: * - V-1.0.0 | - C1 | - C2 * - V-1.1.0 | - C3 * - V-1.0.1 (Bug fix to the V1.0 release) | - C4 This is why I recommended that you create a branch off of whatever release you are using and then use the rebase from the base from the tag to the head of your branch on to master or wherever you want Something like this: git rebase --onto nuttx-1.2 nuttx-1.0 HEAD --Brennan
