Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 5, 2025

Automatic merge failed! Please merge 24.11 into 25.3_fb_bot_merge_24.11 and resolve conflicts manually.

git fetch
git checkout 25.3_fb_bot_merge_24.11
git reset --hard origin/release25.3-SNAPSHOT
git merge a795a1abff1eacec7e31ec9e03cbe02521aedf53 -m "Merge 24.11 to 25.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=25.3_fb_bot_merge_24.11

@cnathe cnathe force-pushed the 25.3_fb_bot_merge_24.11 branch from 8580dcb to 7ed7522 Compare May 5, 2025 15:25
@github-actions github-actions bot merged commit 7ed7522 into release25.3-SNAPSHOT May 5, 2025
8 checks passed
@github-actions github-actions bot deleted the 25.3_fb_bot_merge_24.11 branch May 5, 2025 17:10
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.

4 participants