fix: Configure git identity before merge in conflict resolution#818

stranske merged 1 commit intomainstranske/Workflows:mainfrom

fix/git-identity-for-mergestranske/Workflows:fix/git-identity-for-mergeCopy head branch name to clipboard