Added an error message.

LieberLieber · Dec 12, 2023 · 29e0c17 · 29e0c17
1 parent ec9f401
commit 29e0c17
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/example-scripts/powershell/rebase.ps1 b/example-scripts/powershell/rebase.ps1
@@ -7,7 +7,8 @@ git rebase origin/main
 
 while($LASTEXITCODE -ne 0) {
 	$status = git status -s
-	if($status -ne "UU BaseModel.eapx") {
+	if($status -ne "UU DemoModel.eapx") {
+		Write-Output "::error::Model is not conflicted please rebase manually."
 		exit 666
 	}