jdk25u merge conflict in .github/workflows/main.yml

[andrew-m-leonard]

Merge conflict error for mirror job:

Merging build tag jdk-25.0.2+10 into release branch
+ git merge '-mMerging jdk-25.0.2+10 into release' jdk-25.0.2+10
Auto-merging .github/workflows/main.yml
CONFLICT (content): Merge conflict in .github/workflows/main.yml

Important: Following instructions for resolving a conflict in "Merging build tag TAG into release branch"
Resolved following the following steps by a user with "Write" access:

git clone git@github.com:adoptium/mirror-scripts.git
cd mirror-scripts
export releaseTagExcludeList=""
ssh-add
bash ./skaraMirror.sh jdk25u
cd workspace/jdk25u
git status
vi .github/workflows/main.yml
/<<<<
# Resolve conflict.....
git add .github/workflows/main.yml
git commit
git tag -a "jdk-25.0.2+10_adopt" -m "Merged jdk-25.0.2+10 into release"
git push --tags origin release
cd ../..
bash ./skaraMirror.sh jdk25u
ssh-add -D

[andrew-m-leonard]

Resolved.