Skip to content

Deleted the files issue #2992 #3059

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

Closed
wants to merge 3 commits into from
Closed

Deleted the files issue #2992 #3059

wants to merge 3 commits into from

Conversation

utkars3
Copy link

@utkars3 utkars3 commented Mar 21, 2023

Close #2992

I had deleted the files that are to be deleted

@utkars3 utkars3 requested review from a team and joshblack March 21, 2023 20:46
@changeset-bot
Copy link

changeset-bot bot commented Mar 21, 2023

⚠️ No Changeset found

Latest commit: 8ece200

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Member

Choose a reason for hiding this comment

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

@broccolinisoup should these still be included in src or are they safe to be removed? 👀

Copy link
Author

Choose a reason for hiding this comment

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

@joshblack the issue was to delete the files.Have i done something wrong?

Copy link
Member

Choose a reason for hiding this comment

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

Hey @utkars3! 👋 I think you're totally fine, just wanted to confirm the changes with @broccolinisoup since we ran into some issues specifically with Dialog in our last recent 👀

Just wanted to say thanks for making this PR, by the way! We appreciate it a ton 🙏

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for pinging me @joshblack! Yes, as you mentioned we ran into some import/export issues last week and I reverted the Dialog and Dialog2 changes. That means, we will still need to keep src/Dialog.tsx and src/Dialog.docs.json for now.

Copy link
Author

Choose a reason for hiding this comment

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

@broccolinisoup whats about ActionMenu.tsx

Copy link
Member

Choose a reason for hiding this comment

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

ActionMenu.tsx is good to go! #3059 (comment)

Copy link
Member

@broccolinisoup broccolinisoup left a comment

Choose a reason for hiding this comment

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

If we could take the Dialog and Dialog2 changes back, this should be good 🙂

@github-actions
Copy link
Contributor

Hi! This pull request has been marked as stale because it has been open with no activity for 60 days. You can comment on the pull request or remove the stale label to keep it open. If you do nothing, this pull request will be closed in 7 days.

@github-actions github-actions bot added the Stale label May 22, 2023
@broccolinisoup
Copy link
Member

Hi @utkars3 👋🏻 Are you still interested in following up with the changes? I think we need to only remove ActionMenu.tsx. Please see this comment as well

@github-actions github-actions bot removed the Stale label May 22, 2023
@utkars3
Copy link
Author

utkars3 commented May 23, 2023

@broccolinisoup ya i am interested to delete the files

@broccolinisoup
Copy link
Member

@utkars3 Great! Do you need help with resolving conflicts to start with?

@utkars3
Copy link
Author

utkars3 commented May 24, 2023

@broccolinisoup i have to delete ActionMenu.tsx?

@lesliecdubs
Copy link
Member

👋🏻 @broccolinisoup can you weigh in here? This PR is starting to get a bit stale.

@broccolinisoup
Copy link
Member

Hi @utkars3 sorry for missing your comment!

We need to resolve conflicts first. Apparently, there are new changes on the src/ActionMenu.tsx but in this PR we are trying to delete it, so git sees this as a conflict and this conflict needs to be resolved manually on the command line. There are instructions of how to do that if you click/enter "Use the command line" in the "This branch has conflicts that must be resolved" section. We also need to take the Dialog and Dialog2 changes back as it is mentioned here

If resolving conflicts is an area that you are not familiar with, other option could be;

  • Closing this PR
  • Fetching main
  • Create a new branch on top of the latest main
  • Delete only src/ActionMenu.tsx
  • Push another PR

Thank you for your contribution 🙏🏻 Let me know if you need any help!

@github-actions
Copy link
Contributor

Hi! This pull request has been marked as stale because it has been open with no activity for 60 days. You can comment on the pull request or remove the stale label to keep it open. If you do nothing, this pull request will be closed in 7 days.

@github-actions github-actions bot added the Stale label Aug 26, 2023
@github-actions github-actions bot closed this Sep 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove duplicated ActionMenu file
5 participants