How to properly organize the work of several developers and a test server?

Question

git

Good afternoon. I do not quite understand how to build the correct work given my configuration.
1) prod prod
2) test test
3) local versions on the PC of developers local-branch-1,2,3,4...
Suppose one of the developers implements the task on his PC in a separate local-branch-1 branch, merged with test, when it's done, it commits the changes and pushes them back to test for testing.
The next developer at this point is pushing his local branch local-branch-2 to test
As a result, test includes the results of local-branch-1 and local-branch-2 respectively.
local-branch-1 - tested and accepted, it needs to be uploaded to prod, but local-branch-2, on the contrary, is still being tested.
It turns out that we cannot merge the test branch with the master, since it includes local-branch-1 and local-branch-2.
The question arises, how to get out of this situation? take a specific local-branch-1 branch and merge with prod?
What other options are there?
At the moment, we are waiting for the results of testing all tasks on test and merging them in bulk into prod, it seems to me that this is not quite the right approach, but since we are just forming the architecture for working with the project, there is still time to build everything correctly. Thanks in advance!

Answer 1

You have some strange "thing". There is a pretty well thought out git flow. It is better to start with it, and then think about whether to take it as is or adapt it.

Answer 2

Do not tie testing to branches, but do it as you see fit.
In principle, you now have a good option, because as everything is tested together, you can identify regressions that would not have appeared separately. In gitflow, the release branch is most often tested this way. But you, as I understand it, have rolling-releases? Then test features separately, immediately set up the assembly of many test environments so that it does not slow down the process, and the speed will increase significantly.