Release support in Git, no headaches. How?

Question

git

There is a project, release n is being prepared. There are few tasks that will be uploaded to this release and the test will drag on for another two weeks, but there are tasks that will be included in the n + 1 release, and naturally, so that the work does not stop, tasks for the n + 1 release are being made. Actually the question is how to support all this in Git with less pain?
While there is an option not to merge branches for release n + 1 and wait for release n, but during this time there will be 15-20 branches and there will be conflicts during the next merge.
Or create two release_n and release_n+1 branches, then the release_n branch will merge into the master, and release_n+1 either rebase, or merge new commits from the master into it and merge.

Answer 1

We also looked for a solution to a similar problem and came to the conclusion that the following modified gitflow gives us the least pain:
Here we have described this approach in more detail and explained some subtle points (for example, what to do if several tasks are logically related to each other).
This workflow is not suitable for everyone, a lot depends on the processes that have developed in the team. But in the situation that is described in the question, it should help (perhaps with slight modifications).

Answer 2