Skip to content

[bot] Merge 26.3 to develop (Conflicts)#2912

Merged
github-actions[bot] merged 4 commits intodevelopfrom
fb_bot_merge_26.3
Mar 11, 2026
Merged

[bot] Merge 26.3 to develop (Conflicts)#2912
github-actions[bot] merged 4 commits intodevelopfrom
fb_bot_merge_26.3

Conversation

@github-actions
Copy link

Automatic merge failed! Please merge 26.3 into fb_bot_merge_26.3 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_26.3
git reset --hard origin/develop
git merge 93814835304dff778eade40844ff0a9fa9606cc9 -m "Merge 26.3 to develop"

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=fb_bot_merge_26.3

@cnathe cnathe force-pushed the fb_bot_merge_26.3 branch from 1a873a7 to 03efcd1 Compare March 11, 2026 16:59
@github-actions github-actions bot merged commit 03efcd1 into develop Mar 11, 2026
8 checks passed
@github-actions github-actions bot deleted the fb_bot_merge_26.3 branch March 11, 2026 17:39
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.

5 participants