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

[V1] Cherry pick dock updates to v1 #6378

Merged
merged 1 commit into from
Mar 27, 2024
Merged

[V1] Cherry pick dock updates to v1 #6378

merged 1 commit into from
Mar 27, 2024

Conversation

riknoll
Copy link
Member

@riknoll riknoll commented Mar 26, 2024

From #6377

@kiki-lee do you need any others?

Steps I ran to make this (using cli)

cd pxt-arcade
git fetch origin
git checkout origin/v1 -b some-branch-name
git cherry-pick 3fac852
git push origin some-branch-name

Then, you open a PR with the new branch

You can get the hash of the commit at the bottom of your PR after you merge it:

image

Also, when you open the PR, you'll need to change the base branch to v1:

image

@riknoll riknoll requested a review from kiki-lee March 26, 2024 17:00
@kiki-lee
Copy link
Contributor

Oh, so it looks like when I'm making the PR for my merge, I can select the v1 option from the dropdown and then when I squash things should go where they need to be?

@riknoll
Copy link
Member Author

riknoll commented Mar 26, 2024

@kiki-lee correct! It's exactly the same as making a PR against master, just the result ends up in a different branch

Copy link
Contributor

@kiki-lee kiki-lee left a comment

Choose a reason for hiding this comment

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

Thanks!

@kiki-lee kiki-lee mentioned this pull request Mar 27, 2024
@riknoll riknoll merged commit e79ab12 into v1 Mar 27, 2024
4 checks passed
@riknoll riknoll deleted the dev/riknoll/cp-kiki-docs branch March 27, 2024 18:43
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.

2 participants