Skip to content

[bot] Merge 21.11 to 22.3 (Conflicts)#109

Merged
github-actions[bot] merged 4 commits intorelease22.3-SNAPSHOTfrom
22.3_fb_bot_merge_21.11
Apr 25, 2022
Merged

[bot] Merge 21.11 to 22.3 (Conflicts)#109
github-actions[bot] merged 4 commits intorelease22.3-SNAPSHOTfrom
22.3_fb_bot_merge_21.11

Conversation

@github-actions
Copy link
Copy Markdown

Automatic merge failed! Please merge 21.11 into 22.3_fb_bot_merge_21.11 and resolve conflicts manually.

git fetch
git checkout 22.3_fb_bot_merge_21.11
git reset --hard origin/release22.3-SNAPSHOT
git merge 70fa65209ca5f3cc23e23c788ecdda2b0d40809b -m "Merge 21.11 to 22.3"
# resolve all conflicts
git commit
git push --force

Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=22.3_fb_bot_merge_21.11

@labkey-tchad labkey-tchad force-pushed the 22.3_fb_bot_merge_21.11 branch from ff3a03c to dde8259 Compare April 25, 2022 17:41
@github-actions github-actions Bot merged commit dde8259 into release22.3-SNAPSHOT Apr 25, 2022
@github-actions github-actions Bot deleted the 22.3_fb_bot_merge_21.11 branch April 25, 2022 20:18
bbimber added a commit that referenced this pull request Jun 16, 2023
* Add comments field to MCC request
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