Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3 #760

Merged
jjenko merged 4 commits from C2026-027-New-Set_At_All_Level-in-the-Applicability-tab-evaluate-having-the-button-grayed-out-for-the-RNO-column-3 into Development 2026-04-30 08:41:02 -04:00
Conversation 5 Commits 4 Files Changed 2
+3
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b321bc354b - Show all commits
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+1
View File
@@ -9241,3 +9241,4 @@ namespace VEPROMS.CSLA.Library
Everything = 2
}
}
mschill commented 2026-04-29 06:20:05 -04:00
Review
Copy Link
Copy Source

Just checking? --- why was this file changed?

Just checking? --- why was this file changed?
plarsen commented 2026-04-29 09:06:13 -04:00
Review
Copy Link
Copy Source

The first push I did the pull request was out of sync with dev. You had pushed the checkoff fix into dev just before I pushed the Set All At Level button changes. I need to get the latest file (ItemExt.cs) that was changed into my branch so my push would be in sync. After I added the latest version of ItemExt.cs to my branch the push was up to date. I checked the dev version to my branch version of ItemExt.cs and they were the same.

The first push I did the pull request was out of sync with dev. You had pushed the checkoff fix into dev just before I pushed the Set All At Level button changes. I need to get the latest file (ItemExt.cs) that was changed into my branch so my push would be in sync. After I added the latest version of ItemExt.cs to my branch the push was up to date. I checked the dev version to my branch version of ItemExt.cs and they were the same.
mschill commented 2026-04-29 09:26:26 -04:00
Review
Copy Link
Copy Source

per below - there is the addition of an extra line.

I know it may seem like overkill ---- but frmVEPROMS & ItemExt have other pending changes like the ones in this pull request:

https://git.volian.com/Volian/SourceCode/pulls/756/files

As such, unneeded changes set these files up for merge conflicts once other requests are merged into Dev branch,

As such, my recommendation would be to download the latest of these files from the Dev branch locally then pushing those to this branch to avoid problems in the GIT repo in the future / possible extra future work --- that being said, ultimately, this would be John/Devin's decision.

If assistance is needed, I am happy to help as I would much rather spend 5-10 minutes now as opposed to several hours later doing cleanup and manually clearing conflicts.

per below - there is the addition of an extra line. I know it may seem like overkill ---- but frmVEPROMS & ItemExt have other pending changes like the ones in this pull request: https://git.volian.com/Volian/SourceCode/pulls/756/files As such, unneeded changes set these files up for merge conflicts once other requests are merged into Dev branch, As such, my recommendation would be to download the latest of these files from the Dev branch locally then pushing those to this branch to avoid problems in the GIT repo in the future / possible extra future work --- that being said, ultimately, this would be John/Devin's decision. If assistance is needed, I am happy to help as I would much rather spend 5-10 minutes now as opposed to several hours later doing cleanup and manually clearing conflicts.
plarsen commented 2026-04-29 09:51:48 -04:00
Review
Copy Link
Copy Source

That is what I did with ItemExt.cs. I grabbed the dev version and added it to my branch. frmVEPROMS.cs in dev is identical to the one in my branch except the removed using statement. So, I would think there would be no merge conflicts.

That is what I did with ItemExt.cs. I grabbed the dev version and added it to my branch. frmVEPROMS.cs in dev is identical to the one in my branch except the removed using statement. So, I would think there would be no merge conflicts.
jjenko commented 2026-04-29 11:01:14 -04:00
Review
Copy Link
Copy Source

All-in-all, if there are no changes compared to the development version, this file should not be checked in. we can check into this tomorrow when we are in the offcie.

All-in-all, if there are no changes compared to the development version, this file should not be checked in. we can check into this tomorrow when we are in the offcie.
PROMS/Volian.Controls.Library/DisplayApplicability.Designer.cs
Generated
+1
View File
3
 @@ -175,3 +175,4 @@ namespace Volian.Controls.Library
}
}
PROMS/Volian.Controls.Library/DisplayApplicability.cs
+1
View File
@@ -516,3 +516,4 @@ namespace Volian.Controls.Library
}
}
}