opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_21.09' into dev

Browse Source
This commit is contained in:
mvdbeek
2021-10-22 22:21:17 +02:00
parent c3fa79b039 8762475d57
commit 5cfa818207
19 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/release.sh
+1 -1
View File
@@ -298,7 +298,7 @@ function perform_stable_merge() {
log_exec git merge -m "Merge branch 'release_${RELEASE_CURR}' into '${STABLE_BRANCH}'" "__release_${RELEASE_CURR}"
PUSH_BRANCHES+=("__stable:${STABLE_BRANCH}")
else
log "Release '${RELEASE_CURR}' < stable branch release '${stable}', skipping merge to to '${STABLE_BRANCH}'"
log "Release '${RELEASE_CURR}' < stable branch release '${stable}', skipping merge to '${STABLE_BRANCH}'"
fi
git checkout "$branch_curr"
}