[patch] 修改逻辑: 在用户误触或开了多个GUI程序的时候不能同时建立多个连接 确保一个账号只能建立一个与后端的连接 友好提示的集成review 修改powershell语法问题
This commit is contained in:
@@ -409,7 +409,7 @@ jobs:
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Clean up any existing rebase state before starting
|
# Clean up any existing rebase state before starting
|
||||||
$rebaseExists = Test-Path ".git/rebase-merge" -Or (Test-Path ".git/rebase-apply");
|
$rebaseExists = (Test-Path ".git/rebase-merge") -or (Test-Path ".git/rebase-apply");
|
||||||
if ($rebaseExists) {
|
if ($rebaseExists) {
|
||||||
Write-Host "WARNING: Found existing rebase state, cleaning up...";
|
Write-Host "WARNING: Found existing rebase state, cleaning up...";
|
||||||
git rebase --abort 2>$null;
|
git rebase --abort 2>$null;
|
||||||
@@ -509,7 +509,7 @@ jobs:
|
|||||||
Write-Host "Preparing for retry $i...";
|
Write-Host "Preparing for retry $i...";
|
||||||
|
|
||||||
# Step 1: Clean up any rebase state
|
# Step 1: Clean up any rebase state
|
||||||
$rebaseCheck = Test-Path ".git/rebase-merge" -Or (Test-Path ".git/rebase-apply");
|
$rebaseCheck = (Test-Path ".git/rebase-merge") -or (Test-Path ".git/rebase-apply");
|
||||||
if ($rebaseCheck) {
|
if ($rebaseCheck) {
|
||||||
Write-Host "Cleaning up rebase state...";
|
Write-Host "Cleaning up rebase state...";
|
||||||
git rebase --abort 2>$null;
|
git rebase --abort 2>$null;
|
||||||
|
|||||||
Reference in New Issue
Block a user