Skip to content

Script fix #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghidalgo3 merged 1 commit into from
Jan 13, 2026
Merged

Script fix #517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion scripts/release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,23 @@ function run_release() {
check_gh_cli
check_clean_working_directory

# Step 1: Checkout develop branch
# Step 1: Checkout develop branch and sync with main
echo "Step 1: Checking out develop branch..."
git checkout develop
echo "Pulling latest changes from origin..."
git pull origin develop

echo "Pulling latest changes from main..."
git fetch origin main
echo "Merging main into develop to ensure all changes are included..."
if ! git merge origin/main -m "Merge main into develop for release"; then
echo ""
echo "Merge conflict detected. Please resolve conflicts and run the script again."
error "Failed to merge main into develop"
fi

echo "Pushing updated develop to origin..."
git push origin develop
echo ""

# Step 2: Identify latest release
Expand Down
Loading