first create a clean branch
#
git checkout main

git pull

git checkout -b feature-a-fixes

then use git cherry-pick with patch mode
#
git cherry-pick -n <fixes-commit-hash>

manually stage only the relevant changes
#
git reset # unstage all changes

git add -p

commit only the staged fixes
#
git commit -m "Fix: [Feature_A] related bug fixes extracted from develop"