[bot] Merge 26.3 to 26.7 (Conflicts) - #1840
Merged
github-actions[bot] merged 2 commits intoAug 10, 2026
Merged
Conversation
update the last grid on the assignment dashboard ("Animals under the age
of 3 with an assignment pool note ")
Instead of a general > note, they now have a flag - Category: Assign
Alias, Meaning: Assignment pool.
keep the grid the same, except replace the field "notes pertaining to
DAR" with the "Meaning" field from the active flags page and rename the
column so it's called "Flag"
labkey-klum
force-pushed
the
26.7_fb_bot_merge_26.3
branch
from
August 10, 2026 17:32
f1edaf4 to
b7ebeb6
Compare
labkey-klum
approved these changes
Aug 10, 2026
github-actions
Bot
merged commit Aug 10, 2026
b7ebeb6
into
release26.7-SNAPSHOT
8 of 10 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
26.3into26.7_fb_bot_merge_26.3and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.7_fb_bot_merge_26.3