Merge branch 'master' into shadergraph-rename-EditorAtrribute

QuackCola · QuackCola · commit 96f214525b33 · 2026-04-16T10:23:01.000-04:00
diff --git a/engine/Tools/SboxBuild/Steps/SyncPublicRepo.cs b/engine/Tools/SboxBuild/Steps/SyncPublicRepo.cs
@@ -508,7 +508,7 @@ private string PushToPublicRepository( string relativeRepoPath )
 			}
 		}
 
-		if ( !Utility.RunProcess( "git", $"push public {PUBLIC_BRANCH} --force", relativeRepoPath ) )
+		if ( !Utility.RunProcess( "git", $"push public {PUBLIC_BRANCH}", relativeRepoPath ) )
 		{
 			Log.Error( "Failed to push to public repository" );
 			return null;

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ private string PushToPublicRepository( string relativeRepoPath )`
`508`	`508`	`}`
`509`	`509`	`}`
`510`	`510`
`511`		`- if ( !Utility.RunProcess( "git", $"push public {PUBLIC_BRANCH} --force", relativeRepoPath ) )`
	`511`	`+ if ( !Utility.RunProcess( "git", $"push public {PUBLIC_BRANCH}", relativeRepoPath ) )`
`512`	`512`	`{`
`513`	`513`	`Log.Error( "Failed to push to public repository" );`
`514`	`514`	`return null;`