How to do a partial merge to avoid subsequent hemorrhoids?

Question

git

Hello.
How to do a partial merge to avoid subsequent hemorrhoids? We need to comply with several conditions when merging:
1) a visual display of where something was uploaded from,
2) so that during a partial merge (let's say I checked part of the code from the branch that we want to upload to the main branch), the rest, not yet uploaded, does not disappear. With a normal merge, now after a partial merge, it is no longer possible to re-merge those changes that were not initially uploaded, respectively, they are lost
. I know about cherry-pick, but point 1 is not fulfilled with it which you do cherry-pick so that there are no problems. In general, how do you do and what do you advise?
I'll tell you the situation in more detail. There is a main develop branch from which a feature/some_new_feature branch is created for each new feature, about 10-20 such branches can accumulate, because several developers are working on different features in parallel. I check all this before the release, I'm the only one, so the check can be delayed. there are many and I am alone. Each of them periodically adds an updated develop to itself, and when merging, in addition to the changes that they made in their branch, they also get changes from develop, which is not good ....
In general, I need to be able to:
1) upload only them to master changes made for a specific task
2) the ability to do it in parts

Answer 1

To make the process painless, pulling develop into feature-branch is best done like this:
git pull --rebase origin develop (in feature branch)
git push origin feature-brunch --force Do
the same before merge into develop.

Answer 2

I'll just leave this here.