Reworded sync message

isc-etamarch · isc-etamarch · commit fb3f2f1c89bf · 2024-10-22T09:54:31.000-04:00
diff --git a/csp/sync.csp b/csp/sync.csp
@@ -115,7 +115,7 @@
                         if defaultBasic { 
                             set message = "Please change branches to make sure your changes are committed." 
                         } else {
-                            set message = "Other users have unstaged changes in this namespace, so merging to remote will fail"
+                            set message = "Other users have work in progress in this namespace. They must commit their work before you can sync, or you can commit their work after review in the Git WebUI before trying to sync again."
                         }
                             &html<
                                 <div class = "alert">

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@`
`115`	`115`	`if defaultBasic {`
`116`	`116`	`set message = "Please change branches to make sure your changes are committed."`
`117`	`117`	`} else {`
`118`		`- set message = "Other users have unstaged changes in this namespace, so merging to remote will fail"`
	`118`	`+ set message = "Other users have work in progress in this namespace. They must commit their work before you can sync, or you can commit their work after review in the Git WebUI before trying to sync again."`
`119`	`119`	`}`
`120`	`120`	`&html<`
`121`	`121`	`<div class = "alert">`