Skip to content

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

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

Open
abgox wants to merge 2 commits into
base: develop
Choose a base branch
from
+3 −0
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66265d9
fix(auto-pr): rebase local branch before push to avoid conflicts
abgox Mar 23, 2026
88f57ca
docs(changelog): update CHANGLOG
abgox Mar 23, 2026
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
- **core:** Fix substitute handling of substring keys ([#6561](https://github.com/ScoopInstaller/Scoop/issues/6561))
- **core:** Check `$deprecated_dir` exists before accessing it ([#6574](https://github.com/ScoopInstaller/Scoop/issues/6574))
- **checkver:** Remove redundant always-true condition in GitHub checkver logic ([#6571](https://github.com/ScoopInstaller/Scoop/issues/6571))
- **auto-pr** Rebase before pushing in `auto-pr.ps1` to prevent push conflicts ([#6624](https://github.com/ScoopInstaller/Scoop/issues/6624))

### Code Refactoring

Expand Down
2 changes: 2 additions & 0 deletions bin/auto-pr.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ hub diff --name-only | ForEach-Object {
}

if ($Push) {
Write-Host 'Rebasing local branch before push ...' -ForegroundColor DarkCyan
execute "hub pull --rebase origin $OriginBranch"
Write-Host 'Pushing updates ...' -ForegroundColor DarkCyan
execute "hub push origin $OriginBranch"
} else {
Expand Down
Loading