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 24.7 to develop (Conflicts) #918

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Automatic merge failed! Please merge 24.7 into fb_bot_merge_24.7 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_24.7
git reset --hard origin/develop
git merge fc8f13c389fc8a494253d14bc48649cb8fc5d4d3 -m "Merge 24.7 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_24.7

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
)
@github-actions github-actions bot merged commit 6955e79 into develop Oct 31, 2024
4 checks passed
@github-actions github-actions bot deleted the fb_bot_merge_24.7 branch October 31, 2024 20:36
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