fix(toolbar): restore Blocks/Theme tabs lost in #78 merge#83
Closed
sarahdayan wants to merge 1 commit intomainfrom
Closed
fix(toolbar): restore Blocks/Theme tabs lost in #78 merge#83sarahdayan wants to merge 1 commit intomainfrom
sarahdayan wants to merge 1 commit intomainfrom
Conversation
The merge commit in #78 (2f2cde0) incorrectly resolved conflicts by keeping main's Manual/AI/Theme tab structure instead of the branch's intended Blocks/Theme structure. This removes the top-level AI tab, restores the Blocks tab with grid icon, and removes the orphaned onMoveBlock callback and env prop. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
✅ Deploy Preview for algolia-experiences-react ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for algolia-experiences-js ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
2f2cde0) incorrectly resolved conflicts by keeping main'sManual/AI/Themetab structure instead of the branch's intendedBlocks/ThemestructureonMoveBlockcallback andenvprop