Fix realese.sh

release.sh

@@ -50,9 +50,10 @@ OLD_VERSION=$(grep version setup.cfg | awk -F' = ' '{print $2}')
 
 # Update setup.cfg with the new version and push to $TARGET_BRANCH
 sed -i s/"$OLD_VERSION"/"$STRIPPED_VERSION"/g "$SETUP_CFG"
-git commit -a -m"Update version: $TARGET_BRANCH"
-git push origin "$TARGET_BRANCH"
+git commit -am "Update version: $TARGET_BRANCH"
 git push origin "$BASE_SOURCE_BRANCH"
+git rebase origin/"$BASE_SOURCE_BRANCH"
+git push origin "$TARGET_BRANCH"
 
 # Create release on Github
 gh release create "$VERSION"
@@ -62,7 +63,7 @@ gren release -D prs --override
 
 # Generate and push CHANGELOG.md
 gren changelog --override
-git commit -a -m"Update changelog for version $VERSION"
+git commit -am "Update changelog for version $VERSION"
 git push -f origin "$TARGET_BRANCH"
 
 git pull origin "$TARGET_BRANCH"