We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent a71f997 commit 14a10d8Copy full SHA for 14a10d8
1 file changed
āsrc/gitutils/_git-release-prod.shā
@@ -82,6 +82,17 @@ if bump-changelog -f $GBV -b -m; then
82
zz_log s "Version & CHANGELOG committed and pushed"
83
fi
84
85
+ # Ensure develop branch is up-to-date before finishing release
86
+ if ! git fetch origin develop:develop; then
87
+ zz_log e "Cannot fetch develop branch from remote"
88
+ exit 1
89
+ fi
90
+
91
+ if ! git merge-base --is-ancestor $(git rev-parse develop) $(git rev-parse origin/develop) ; then
92
+ zz_log e "Develop branch is not up-to-date with remote. Please pull the latest changes."
93
94
95
96
if git flow $flow finish $name --push --tagname $GBV --message $GBV ; then
97
zz_log s "Release finished: {B $GBV}"
98
rm -f .git/RELEASE
0 commit comments