Git merge branching good practices
The main idea is that master branch have all the commits
When adding a new feature
You don't. If you want to cherry pick it's because someone (probably you) mess things up.
What does a normal pull request ask you to merge? You have to see only the commits you have done. If there are commits on your side that you don't want to merge, just create a new branch, cherry pick there and then pull request.
Every time you make a pull request to a specific version, you also have to pull request to master. This way, you will always