Skip to content

[bot] Merge 25.11 to 26.3 (Conflicts)#1124

Merged
github-actions[bot] merged 2 commits intorelease26.3-SNAPSHOTfrom
26.3_fb_bot_merge_25.11
May 4, 2026
Merged

[bot] Merge 25.11 to 26.3 (Conflicts)#1124
github-actions[bot] merged 2 commits intorelease26.3-SNAPSHOTfrom
26.3_fb_bot_merge_25.11

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions Bot commented May 4, 2026

Automatic merge failed! Please merge 25.11 into 26.3_fb_bot_merge_25.11 and resolve conflicts manually.

git fetch
git checkout 26.3_fb_bot_merge_25.11
git reset --hard origin/release26.3-SNAPSHOT
git merge f85a6a983f29e47b61114bf883a936d8eca63181 -m "Merge 25.11 to 26.3"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

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.3_fb_bot_merge_25.11

* Disable the 'Submit' buttons until validation is completed. Add an indicator while validation is in progress.
* Align the button and error-panel timing.
* Allow users to revert and enable "Submit" buttons during validation via an experimental feature flag if anything goes awry
* Move the validation indicator below the form action buttons to avoid crowding on narrower layouts (ex. tablets)
@labkey-klum labkey-klum force-pushed the 26.3_fb_bot_merge_25.11 branch from 9442446 to fc811d9 Compare May 4, 2026 17:59
@github-actions github-actions Bot merged commit fc811d9 into release26.3-SNAPSHOT May 4, 2026
8 of 10 checks passed
@github-actions github-actions Bot deleted the 26.3_fb_bot_merge_25.11 branch May 4, 2026 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants