File tree Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change 109109 <h1 class="text-center">Sync Repository</h1>
110110 <div class="row">
111111 <div class="offset-sm-2 col-sm-8">
112- <server>
113- if ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode() || ##class(SourceControl.Git.Change).GetOtherDeveloperChanges().%Size() > 0 {
114- set message = $case(##class(SourceControl.Git.Utils).InDefaultBranchBasicMode(),
115- 1:"Please change branches to make sure your changes are committed.",
116- :"Other users have unstaged changes in this namespace, so merging to remote will fail")
112+ <server>
113+ set defaultBasic = ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode()
114+ if defaultBasic || ##class(SourceControl.Git.Change).GetOtherDeveloperChanges().%Size() > 0 {
115+ if defaultBasic {
116+ set message = "Please change branches to make sure your changes are committed."
117+ } else {
118+ set message = "Other users have unstaged changes in this namespace, so merging to remote will fail"
119+ }
117120 &html<
118121 <div class = "alert">
119122 <span class="closebtn" onclick="this.parentElement.style.display='none';">×</span>
You can’t perform that action at this time.
0 commit comments