Add warning in sync

Author: isc-etamarch

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added 'git push --force' in expert mode (#527)
 - Add remote repository to settings page (#448)
 - Added environment awareness in configuration, and showing of environment name in UI (#124)
+- Warning on sync page if other users have unstaged changes (#493)
 
 ### Fixed
 - Fixed display of other users' username in workspace view on Unix (#530)

csp/sync.csp

@@ -110,11 +110,14 @@
             <div class="row">
                 <div class="offset-sm-2 col-sm-8">
                     <server>
-                        if ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode() {
+                        if ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode() || ##class(SourceControl.Git.Change).GetOtherDeveloperChanges().%Size() > 0 {
+                            set message = $case(##class(SourceControl.Git.Utils).InDefaultBranchBasicMode(),
+                                1:"Please change branches to make sure your changes are committed.",
+                                :"Other users have unstaged changes in this namespace, so merging to remote will fail")
                             &html<
                                 <div class = "alert">
                                     <span class="closebtn" onclick="this.parentElement.style.display='none';">&times;</span>  
-                                    <strong>Warning!</strong> Please change branches to make sure your changes are committed.
+                                    <strong>Warning!</strong> #(message)#
                                 </div>
                             >
                         }