Skip to content

Commit 28a273f

Browse files
author
Stefan Burnicki
committed
Delete local tags before fetching to avoid problems on rebuilding
1 parent dd86a6f commit 28a273f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scripts/ci/building/merge_develop_into_release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ git config user.name 'bamboo iteratec'
1919
echo "########################################'"
2020
echo "git fetch release"
2121
git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
22+
git tag -d $(git tag -l)
2223
git fetch --all
2324
echo "git checkout release"
2425
git checkout release
2526
echo "git merge develop"
26-
git merge develop
27+
git merge develop

0 commit comments

Comments
 (0)