8000 chore!: Rename editing CSS class to blocklyEditing by ga-fleury · Pull Request #8297 · google/blockly · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

chore!: Rename editing CSS class to blocklyEditing #8297

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

chore!: Rename editing CSS class to blocklyEditing #8297

wants to merge 2 commits into from

Conversation

ga-fleury
Copy link
Contributor
@ga-fleury ga-fleury commented Jul 10, 2024 •
edited
Loading

The basics

The details

Resolves

Fixes #8287

Proposed Changes

Reason for Changes

Test Coverage

Documentation

Additional Information

dependabot bot and others added 2 commits July 10, 2024 15:45
@dependabot
chore(deps): bump @typescript-eslint/eslint-plugin from 7.12.0 to 7.1…
0e85c71 
…6.0 (#8296)

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 7.12.0 to 7.16.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.16.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ga-fleury
Rename editing CSS class to blocklyEditing (#8287)
f7539cd
@ga-fleury ga-fleury requested a review from a team as a code owner July 10, 2024 22:52
@ga-fleury ga-fleury requested a review from cpcallen July 10, 2024 22:52
@github-actions github-actions bot added breaking change Used to mark a PR or issue that changes our public APIs. PR: chore General chores (dependencies, typos, etc) and removed breaking change Used to mark a PR or issue that changes our public APIs. PR: chore General chores (dependencies, typos, etc) labels Jul 10, 2024
@BeksOmega BeksOmega requested review from BeksOmega and removed request for cpcallen July 10, 2024 22:59
@BeksOmega BeksOmega assigned BeksOmega and unassigned cpcallen Jul 10, 2024
@BeksOmega
Copy link
Collaborator

Your changes look good! But I still think your branches are a bit messed up :P Here is how to fix them:

  1. git switch -c fix/blockly-editing - This creates a new branch pointing at your checkout commit, which should be the one that fixes the issue.
  2. git rebase -i rc/v12.0.0 - This opens a view that lets you mess with the commits on your current branch. You want to "drop" (d) the commit with the dependabot changes in it.
  3. git push --force origin fix/blockly-editing - This pushes your new branch to your fork of the repo. Technically you only need force if you already have a branch pushed to your fork that you're changing the history of. But usually that's the case when you're rebasing (even though it's not here) so I've included it for consistency with how you'd normally do this.
  4. Open a new pull request merging your fix/blockly-editing branch into rc/v12.0.0

@ga-fleury
Copy link
Contributor Author

2. git rebase -i rc/v12.0.0

Thanks @BeksOmega , I'm getting 'fatal: invalid upstream 'rc/v12.0.0' when running git rebase -i rc/v12.0.0

@ga-fleury ga-fleury closed this Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BeksOmega BeksOmega Awaiting requested review from BeksOmega

Assignees

@BeksOmega BeksOmega

Labels
breaking change Used to mark a PR or issue that changes our public APIs. PR: chore General chores (dependencies, typos, etc)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ga-fleury @BeksOmega @cpcallen
0