Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot] Merge 23.11 to 24.3 (Conflicts) #1002

Merged
merged 2 commits into from
May 2, 2024

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented May 2, 2024

Automatic merge failed! Please merge 23.11 into 24.3_fb_bot_merge_23.11 and resolve conflicts manually.

git fetch
git checkout 24.3_fb_bot_merge_23.11
git reset --hard origin/release24.3-SNAPSHOT
git merge 1570eae8ea73020bd6274e8675bc7df166da7858 -m "Merge 23.11 to 24.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=24.3_fb_bot_merge_23.11

@labkey-klum labkey-klum force-pushed the 24.3_fb_bot_merge_23.11 branch from b8267ab to 9bf485f Compare May 2, 2024 20:01
@github-actions github-actions bot merged commit 9bf485f into release24.3-SNAPSHOT May 2, 2024
4 checks passed
@github-actions github-actions bot deleted the 24.3_fb_bot_merge_23.11 branch May 2, 2024 23:08
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