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), delete component from main upon merge when renaming on a lane #9307

Merged
merged 4 commits into from
Nov 14, 2024

Conversation

davidfirst
Copy link
Member

@davidfirst davidfirst commented Nov 14, 2024

By default, when renaming an exported component, it deletes (mark as delete) the current one and creates a new one.
Currently, when renaming on lane and this component exists on main, it deletes it only on the lane, so after merge, the main remains intact.
This PR marks the deletion on the lane with update-main flag, which knows to include the component during merge to main, which result on a deleted component on main.

Also, it fixes a bug where components on lanes that marked as update-main and the components don't exist on main, it was still merging them unnecessarily.

@davidfirst davidfirst merged commit d1bb0a3 into master Nov 14, 2024
11 checks passed
@davidfirst davidfirst deleted the rename-lane-update-main branch November 14, 2024 23:14
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