#Create a new branch from main

#Write below code in the bash

git checkout main

git pull

git checkout -b

isolate-featureA-fixes

#Cherry pick the commit from test fixes branch

#In Bash

git cherry-pick abc123

#Resolve the conflicts of feature b manually

#split the commit

git reset HEAD~1

git add -p

git commit -m "Test fixes for Feature_A"

git add .

git commit -m "Other unrelated fixes"

#drop/keep the second commit

#push your cleaned-up branch and raise a PR to main with writing below code in bash:

git push origin isolate-featureA-fixes