fix: gracefully handle merge conflicts in main to feature branches action#77

0marperez merged 7 commits intomainaws/aws-kotlin-repo-tools:mainfrom

fix-merge-mnaws/aws-kotlin-repo-tools:fix-merge-mnCopy head branch name to clipboard