diff --git a/dev-bin/release.sh b/dev-bin/release.sh index c4b5945..7065182 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -10,6 +10,16 @@ if [ "$current_branch" = "main" ]; then exit 1 fi +# Fetch latest changes and check that we're not behind origin/main +echo "Fetching from origin..." +git fetch origin + +if ! git merge-base --is-ancestor origin/main HEAD; then + echo "Error: Current branch is behind origin/main." + echo "Please merge or rebase with origin/main before releasing." + exit 1 +fi + changelog=$(cat HISTORY.rst) regex='