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 support to Local Server #634

Merged
merged 3 commits into from
Nov 2, 2023
Merged

Conversation

joehoyle
Copy link
Member

No description provided.

@joehoyle joehoyle requested a review from a team October 25, 2023 14:04
Copy link
Contributor

@mikelittle mikelittle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Just a typo in the docs. And a lint issue about quotes.

docs/using-afterburner.md Outdated Show resolved Hide resolved
@joehoyle joehoyle requested a review from mikelittle October 25, 2023 14:55
Copy link
Contributor

@mikelittle mikelittle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's still a linter issue about double quotes vs single quotes, but otherwise, looks good to me

@joehoyle joehoyle merged commit eeae355 into master Nov 2, 2023
1 of 2 checks passed
@joehoyle joehoyle deleted the afterburner-support branch November 2, 2023 19:28
@hm-backport
Copy link

hm-backport bot commented Nov 8, 2023

The backport to v16-branch failed:

Commits ["793982e5c0bc8e57e5c2e3c1ad6fb76c06292d23","4fd7933dfa3b50c37b2999fbec44ece99e1a8627","9c11880e396e3f51c00e9572b0b38d2f9202cd99"] 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 793982e5c0bc8e57e5c2e3c1ad6fb76c06292d23 4fd7933dfa3b50c37b2999fbec44ece99e1a8627 9c11880e396e3f51c00e9572b0b38d2f9202cd99
# Create a new branch with these backported commits.
git checkout -b backport-634-to-v16-branch
# Push it to GitHub.
git push --set-upstream origin backport-634-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-634-to-v16-branch.

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.

3 participants