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

fix!: Rename blocklyTreeIconOpen to blocklyToolboxCategoryIconOpen #8440

Merged
merged 1 commit into from
Jul 31, 2024

Conversation

UtkershBasnet
Copy link

@UtkershBasnet UtkershBasnet commented Jul 28, 2024

The basics

The Details

The pull request renames all references to blocklyTreeIconOpen to blocklyToolboxCategoryIconOpen

Resolves

Fixes #8348

@UtkershBasnet UtkershBasnet requested a review from a team as a code owner July 28, 2024 17:22
@UtkershBasnet UtkershBasnet requested a review from cpcallen July 28, 2024 17:22
Copy link

google-cla bot commented Jul 28, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@github-actions github-actions bot added the PR: fix Fixes a bug label Jul 28, 2024
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome! It looks like this is your first pull request in Blockly, so here are a couple of tips:

  • You can find tips about contributing to Blockly and how to validate your changes on our developer site.
  • All contributors must sign the Google Contributor License Agreement (CLA). If the google-cla bot leaves a comment on this PR, make sure you follow the instructions.
  • We use conventional commits to make versioning the package easier. Make sure your commit message is in the proper format or learn how to fix it.
  • If any of the other checks on this PR fail, you can click on them to learn why. It might be that your change caused a test failure, or that you need to double-check the style guide.
    Thank you for opening this PR! A member of the Blockly team will review it soon.

@github-actions github-actions bot added PR: fix Fixes a bug and removed PR: fix Fixes a bug labels Jul 28, 2024
@BeksOmega BeksOmega requested review from BeksOmega and removed request for cpcallen July 30, 2024 02:22
@BeksOmega BeksOmega assigned BeksOmega and unassigned cpcallen Jul 30, 2024
@BeksOmega
Copy link
Collaborator

Heya @UtkershBasnet in the future we ask that folks ask to be assigned to issues before completing them! Otherwise it's not fair to the other folks that may be working on it. If you do that in the future, I'll have to close your PR.

Copy link
Collaborator

@BeksOmega BeksOmega left a comment

Choose a reason for hiding this comment

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

This change looks good =) Thank you for the fix!

@UtkershBasnet
Copy link
Author

@BeksOmega Thank you for the feedback and for reviewing my PR!

I apologize for not asking to be assigned to the issue before completing it. I understand the importance of maintaining fairness in the process and will make sure to follow this protocol in the future.

I'm glad the change looks good to you! Thank you for the review and for your guidance.

@BeksOmega BeksOmega changed the title fix: Renamed blocklyTreeIconOpen CSS class fix!: Rename blocklyTreeIconOpen to blocklyToolboxCategoryIconOpen Jul 30, 2024
@github-actions github-actions bot added breaking change Used to mark a PR or issue that changes our public APIs. PR: fix Fixes a bug and removed PR: fix Fixes a bug labels Jul 30, 2024
@BeksOmega
Copy link
Collaborator

Ah sorry, just noticed this is against the wrong branch @UtkershBasnet

To rebase onto the rc/v12.0.0 branch, you can follow these steps.

  1. Fetch the latest changes from rc/v12.0.0:

    git fetch upstream rc/v12.0.0
  2. Checkout your branch:

    git checkout [your-branch-name]
  3. Start an interactive rebase:

    git rebase -i upstream/rc/v12.0.0
  4. In the editor that opens, identify the commits that aren't yours. These are likely the ones at the top of the list.

  5. Change the word pick to drop for each commit you want to remove.

  6. Save and close the editor.

  7. Force push your changes to your branch: Note that force pushing is a dangerous operation because it overwrites commit history, so if you dropped the wrong commits you could lose work.

    git push -f origin [your-branch-name]

Once you've done this, the PR should be on the correct branch.

Let me know if you have any questions or run into any issues!

@UtkershBasnet
Copy link
Author

UtkershBasnet commented Jul 30, 2024

Screenshot 2024-07-30 at 9 48 43 PM I dropped all the changes that weren't mine but still additional commits were made probably due to-

git fetch upstream rc/v12.0.0

During the rebase I wasn't given access to remove other commits which are shown now ,I could only drop 6-7 commits the last commit was mine.

@BeksOmega BeksOmega changed the base branch from develop to rc/v12.0.0 July 31, 2024 01:13
@github-actions github-actions bot added breaking change Used to mark a PR or issue that changes our public APIs. PR: fix Fixes a bug and removed PR: fix Fixes a bug breaking change Used to mark a PR or issue that changes our public APIs. labels Jul 31, 2024
@BeksOmega
Copy link
Collaborator

Can you try it with this slightly modified set of commands? (1 and 2 are changed)

  1. Switch to the rc/v12.0.0 branch

    git switch rc/v12.0.0
  2. Pull the latest changes from rc/v12.0.0:

    git pull upstream rc/v12.0.0
  3. Checkout your branch:

    git switch [your-branch-name]
  4. Start an interactive rebase:

    git rebase -i upstream/rc/v12.0.0
  5. In the editor that opens, identify the commits that aren't yours. These are likely the ones at the top of the list.

  6. Change the word pick to drop for each commit you want to remove.

  7. Save and close the editor.

  8. Force push your changes to your branch: Note that force pushing is a dangerous operation because it overwrites commit history, so if you dropped the wrong commits you could lose work.

    git push -f origin [your-branch-name]

@UtkershBasnet
Copy link
Author

I think the problem was in my branch i removed the commits that weren't mine in my own branch using the

git rebase -i HEAD~n

@BeksOmega
Copy link
Collaborator

Thank you again for your work on this!

@BeksOmega BeksOmega merged commit 17db603 into google:rc/v12.0.0 Jul 31, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change Used to mark a PR or issue that changes our public APIs. PR: fix Fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename the blocklyTreeIconOpen CSS class to blocklyToolboxCategoryIconOpen
3 participants