xxxxxxxxxx
git checkout main
git merge MyFix
git branch -d MyFix #dp this to delete your now useless MyFix branch, since
#should now be up to date with main.
xxxxxxxxxx
git checkout main # checkout to the main branch
git merge feature # merging feature branch changes to the main branch