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.7 to develop (Conflicts) #573

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Automatic merge failed! Please merge 23.7 into fb_bot_merge_23.7 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_23.7
git reset --hard origin/develop
git merge 9b139d633006eeff263bffabd20916d5dd4d7ca2 -m "Merge 23.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_23.7

# Conflicts:
#	gradle.properties
@github-actions github-actions bot merged commit 9143879 into develop Sep 26, 2023
1 check passed
@github-actions github-actions bot deleted the fb_bot_merge_23.7 branch September 26, 2023 14:37
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