Skip to content

Handle already deleted local branch in sync script #7

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
TamaruNorio merged 1 commit into from
May 25, 2026
Merged

Handle already deleted local branch in sync script #7

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
12 changes: 10 additions & 2 deletions scripts/sync_after_merge.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@ try {
git pull
}

Invoke-Step "delete local branch $Branch" {
git branch -d $Branch
git show-ref --verify --quiet "refs/heads/$Branch"
if ($LASTEXITCODE -eq 0) {
Invoke-Step "delete local branch $Branch" {
git branch -d $Branch
}
}
else {
Write-Host ""
Write-Host "== delete local branch $Branch =="
Write-Host "Local branch already deleted. Skipping branch delete."
}

$devCheckScript = Join-Path $PSScriptRoot "dev_check.ps1"
Expand Down
Loading