fix(auto-pr): rebase local branch before push to avoid conflicts

[abgox]

Description

Rebase before pushing in auto-pr.ps1 to prevent push conflicts

Motivation and Context

Closes #6623

Relates to #XXXX

How Has This Been Tested?

Checklist:

• I have read the Contributing Guide.
• I have ensured that I am targeting the develop branch.
• I have updated the documentation accordingly.
• I have updated the tests accordingly.
• I have added an entry in the CHANGELOG.

Summary by CodeRabbit

• Chores
  • Automated script updated to perform a rebase step before pushing when push is enabled, reducing push conflicts.
• Documentation
  • Unreleased changelog entry added noting the new pre-push rebase behavior.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: ca4ea060-bb30-406e-9cf1-1aec80aadd53

📥 Commits

Reviewing files that changed from the base of the PR and between 66265d9 and 88f57ca.

📒 Files selected for processing (1)

• CHANGELOG.md

✅ Files skipped from review due to trivial changes (1)

• CHANGELOG.md

---

Walkthrough

The auto-pr.ps1 script now runs hub pull --rebase origin $OriginBranch immediately before hub push origin $OriginBranch when the -Push flag is used; CHANGELOG.md was updated with an unreleased entry noting this change.

Changes

Cohort / File(s)	Summary
Auto PR script bin/auto-pr.ps1	Added a pre-push hub pull --rebase origin $OriginBranch step and a console message when -Push is enabled.
Changelog CHANGELOG.md	Added an Unreleased bullet noting that auto-pr.ps1 performs a rebase before pushing.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

🐰 I nibble on branches, tidy and spry,
I pull, then rebase, then let pushes fly.
No bumps on the path, no conflicts to mend,
A smooth little hop from branch start to end. ✨

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change: adding a rebase step before push in auto-pr.ps1 to avoid conflicts, which directly matches the changeset.
Linked Issues check	✅ Passed	The PR implements the core requirement from #6623: performing a rebase before push in auto-pr.ps1 to prevent non-fast-forward errors and improve workflow reliability.
Out of Scope Changes check	✅ Passed	All changes are directly related to the stated objective: modifying auto-pr.ps1 to add rebase functionality and updating CHANGELOG.md accordingly, with no extraneous modifications.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}