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

Add Afterburner panel to QM #827

Merged
merged 5 commits into from
Mar 1, 2024
Merged

Add Afterburner panel to QM #827

merged 5 commits into from
Mar 1, 2024

Conversation

joehoyle
Copy link
Member

@joehoyle joehoyle commented Nov 2, 2023

@joehoyle joehoyle requested review from a team and rmccue November 18, 2023 18:46
@joehoyle
Copy link
Member Author

joehoyle commented Mar 1, 2024

Ignoring codeclimate as not needed

@joehoyle joehoyle merged commit e0bcd98 into master Mar 1, 2024
3 of 5 checks passed
@joehoyle joehoyle deleted the afterburner-qm branch March 1, 2024 09:46
@hm-backport
Copy link

hm-backport bot commented Mar 1, 2024

The backport to v18-branch failed:

Commits ["8036a8c11d218fbd021a229b7e4105cb5ae53b6f","d8a65d438f2debe02e731888092b61ecfd4a9de4","7a145e5f2c6571c7cfafaaf66f16113d3409570d","74ab370d0eb88cf92a58502b98d63f02dc0d5d4c","ffa0a75fa724c882c65011472e185f879dd8741e"] could not be cherry-picked on top of v18-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v18-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 8036a8c11d218fbd021a229b7e4105cb5ae53b6f d8a65d438f2debe02e731888092b61ecfd4a9de4 7a145e5f2c6571c7cfafaaf66f16113d3409570d 74ab370d0eb88cf92a58502b98d63f02dc0d5d4c ffa0a75fa724c882c65011472e185f879dd8741e
# Create a new branch with these backported commits.
git checkout -b backport-827-to-v18-branch
# Push it to GitHub.
git push --set-upstream origin backport-827-to-v18-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v18-branch and the compare/head branch is backport-827-to-v18-branch.

@hm-backport
Copy link

hm-backport bot commented Mar 1, 2024

The backport to v16-branch failed:

Commits ["8036a8c11d218fbd021a229b7e4105cb5ae53b6f","d8a65d438f2debe02e731888092b61ecfd4a9de4","7a145e5f2c6571c7cfafaaf66f16113d3409570d","74ab370d0eb88cf92a58502b98d63f02dc0d5d4c","ffa0a75fa724c882c65011472e185f879dd8741e"] could not be cherry-picked on top of v16-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v16-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 8036a8c11d218fbd021a229b7e4105cb5ae53b6f d8a65d438f2debe02e731888092b61ecfd4a9de4 7a145e5f2c6571c7cfafaaf66f16113d3409570d 74ab370d0eb88cf92a58502b98d63f02dc0d5d4c ffa0a75fa724c882c65011472e185f879dd8741e
# Create a new branch with these backported commits.
git checkout -b backport-827-to-v16-branch
# Push it to GitHub.
git push --set-upstream origin backport-827-to-v16-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v16-branch and the compare/head branch is backport-827-to-v16-branch.

@hm-backport
Copy link

hm-backport bot commented Mar 1, 2024

The backport to v17-branch failed:

Commits ["8036a8c11d218fbd021a229b7e4105cb5ae53b6f","d8a65d438f2debe02e731888092b61ecfd4a9de4","7a145e5f2c6571c7cfafaaf66f16113d3409570d","74ab370d0eb88cf92a58502b98d63f02dc0d5d4c","ffa0a75fa724c882c65011472e185f879dd8741e"] could not be cherry-picked on top of v17-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v17-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 8036a8c11d218fbd021a229b7e4105cb5ae53b6f d8a65d438f2debe02e731888092b61ecfd4a9de4 7a145e5f2c6571c7cfafaaf66f16113d3409570d 74ab370d0eb88cf92a58502b98d63f02dc0d5d4c ffa0a75fa724c882c65011472e185f879dd8741e
# Create a new branch with these backported commits.
git checkout -b backport-827-to-v17-branch
# Push it to GitHub.
git push --set-upstream origin backport-827-to-v17-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v17-branch and the compare/head branch is backport-827-to-v17-branch.

@joehoyle
Copy link
Member Author

joehoyle commented Mar 1, 2024

Doh, merge comit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants