From: Julien Déramond Date: Tue, 6 May 2025 14:58:08 +0000 (+0200) Subject: Add re-synchronization of `gh-pages` branch in 'docs-prep.sh' X-Git-Tag: v5.3.7~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fb43fb7371d272f84687dc8b4583f36d2a12824;p=thirdparty%2Fbootstrap.git Add re-synchronization of `gh-pages` branch in 'docs-prep.sh' --- diff --git a/build/docs-prep.sh b/build/docs-prep.sh index 2586ad3437..b0054257e7 100755 --- a/build/docs-prep.sh +++ b/build/docs-prep.sh @@ -76,6 +76,18 @@ if [ $? -ne 0 ]; then fi print_success "Switched to gh-pages branch" +git reset --hard origin/gh-pages +if [ $? -ne 0 ]; then + print_error "Failed to reset to origin/gh-pages. Check your git configuration." +fi +print_success "Reset to origin/gh-pages" + +git pull origin gh-pages +if [ $? -ne 0 ]; then + print_error "Failed to pull from origin/gh-pages. Check your network connection and git configuration." +fi +print_success "Pulled latest changes from origin/gh-pages" + # Step 4: Create a new branch for the update print_info "Creating new branch ${NEW_BRANCH}…" execute "git checkout -b ${NEW_BRANCH}"