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) #183

Merged
merged 2 commits into from
Apr 10, 2024

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Apr 8, 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 563d2a4c5600d2f2d13005148a52407d53cc8ac8 -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

@cnathe cnathe force-pushed the 24.3_fb_bot_merge_23.11 branch from 7a703c3 to 7d55483 Compare April 8, 2024 19:54
@github-actions github-actions bot merged commit 7d55483 into release24.3-SNAPSHOT Apr 10, 2024
3 of 4 checks passed
@github-actions github-actions bot deleted the 24.3_fb_bot_merge_23.11 branch April 10, 2024 13:49
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