Skip to content

Remove colors (v14.x)#2014

Merged
ZauberNerd merged 4 commits intorelease-bot/next-v14.xfrom
remove-colors-v14.x
Jan 11, 2022
Merged

Remove colors (v14.x)#2014
ZauberNerd merged 4 commits intorelease-bot/next-v14.xfrom
remove-colors-v14.x

Conversation

@hops-release-bot
Copy link
Copy Markdown

⚠️ This PR is the successor of #2013 and has been created automatically because the previous PR's commits could not be cherry-picked. ⚠️

Please resolve the conflicts and merge this PR afterwards by running the following command:

git fetch origin && \
git fetch origin pull/2013/head && \
git checkout remove-colors-v14.x && \
git reset --hard HEAD^ && \
git cherry-pick cb0259c18c7acd46086bcd065fb7240f5d656c07 f4f872c602af751ded53433ca418108dee3cc2ab 51bd5c5b84ca35e61ed278c78c823b011215068c 2c9b7ea916559bd009332892ff991f3a1fc80fb7

After successfully resolving all conflicts, you need to force-push your changes.

git push --force origin remove-colors-v14.x

Bors merge bot cheat sheet

We are using bors-ng to automate merging of our pull requests. The following table provides a summary of commands that are available to reviewers (members of this repository with push access) and delegates (in case of bors delegate+ or bors delegate=[list]).

Syntax Description
bors merge Run the test suite and push to master if it passes. Short for "reviewed: looks good."
bors merge- Cancel an r+, r=, merge, or merge=
bors try Run the test suite without pushing to master.
bors try- Cancel a try
bors delegate+ Allow the pull request author to merge their changes.
bors delegate=[list] Allow the listed users to r+ this pull request's changes.
bors retry Run the previous command a second time.

This is a short collection of opinionated commands. For a full list of the commands read the bors reference.

@hops-release-bot hops-release-bot bot added the 📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging. label Jan 11, 2022
@hops-release-bot hops-release-bot bot mentioned this pull request Jan 11, 2022
@ZauberNerd ZauberNerd marked this pull request as ready for review January 11, 2022 10:13
@ZauberNerd ZauberNerd merged commit 8585cdf into release-bot/next-v14.x Jan 11, 2022
@ZauberNerd ZauberNerd deleted the remove-colors-v14.x branch January 11, 2022 13:21
@hops-release-bot hops-release-bot bot mentioned this pull request Jan 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant