Skip to content

fix: orchestrator rebase fetch creates proper remote ref #143

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
microsasa merged 1 commit into from
Mar 17, 2026
Merged

fix: orchestrator rebase fetch creates proper remote ref #143

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
6 changes: 3 additions & 3 deletions .github/workflows/pipeline-orchestrator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,13 @@ jobs:

echo " Attempting rebase of $BRANCH onto main..."

# Fetch latest and attempt rebase
git fetch origin main "$BRANCH" || {
# Fetch latest refs for main and the PR branch
git fetch origin main "$BRANCH":"refs/remotes/origin/$BRANCH" || {
echo " ⚠️ PR #${PR}: Failed to fetch branch. Skipping."
echo "::endgroup::"
continue
}
git checkout -B "$BRANCH" -- "origin/$BRANCH"
git checkout -B "$BRANCH" "origin/$BRANCH"

if git rebase origin/main; then
# Rebase succeeded — force push
Expand Down
Loading