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

Add icon and logo for Aidot #5438

Closed
wants to merge 1 commit into from
Closed

Conversation

s1eedz
Copy link

@s1eedz s1eedz commented May 8, 2024

Proposed change

Add icon and logo for Aidot

Type of change

  • Add a new logo or icon for a new core integration
  • Add a missing icon or logo for an existing core integration
  • Add a new logo or icon for a custom integration (custom component)
  • Replace an existing icon or logo with a higher quality version
  • Replace an existing icon or logo after a branding change
  • Removing an icon or logo

Additional information

  • This PR fixes or closes issue: fixes #
  • Link to code base pull request: Add new integration for AiDot core#117337
  • Link to documentation pull request:
  • Link to integration documentation on our website:
  • Link to custom integration repository:

Checklist

  • The added/replaced image(s) are PNG
  • Icon image size is 256x256px (icon.png)
  • hDPI icon image size is 512x512px for (icon@2x.png)
  • Logo image size has min 128px, but max 256px, on the shortest side (logo.png)
  • hDPI logo image size has min 256px, but max 512px, on the shortest side (logo@2x.png)

@frenck frenck added the has-parent This PR has a parent PR in a other repo label May 13, 2024
c0ffeeca7
c0ffeeca7 previously approved these changes May 14, 2024
Copy link
Contributor

@c0ffeeca7 c0ffeeca7 left a comment

Choose a reason for hiding this comment

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

Thank you, @s1eedz 👍

@c0ffeeca7 c0ffeeca7 added the awaits-parent Awaits the merge of an parent PR label May 14, 2024
@frenck
Copy link
Member

frenck commented May 15, 2024

@s1eedz Was there a reason for the merge? Was there a conflict? Did something change?

Not fully understanding the action here and the reasoning behind it.

../Frenck

@s1eedz
Copy link
Author

s1eedz commented May 15, 2024

@s1eedz Was there a reason for the merge? Was there a conflict? Did something change?

Not fully understanding the action here and the reasoning behind it.

../Frenck

@frenck This is a new integration for aidot. Main code link: home-assistant/core#117337. I don't see a conflict, is there something wrong? If so, thank you very much for your correction. I'll quickly revise my question here.

@frenck
Copy link
Member

frenck commented May 15, 2024

I don't know if something is wrong? That was my question for you...

CleanShot 2024-05-15 at 11 24 35@2x

You merged, and I was asking for the reasoning.

@s1eedz
Copy link
Author

s1eedz commented May 15, 2024

I don't know if something is wrong? That was my question for you...

CleanShot 2024-05-15 at 11 24 35@2x

You merged, and I was asking for the reasoning.

Sorry, I'm not familiar with the operation of github. I executed the update branch on github, but I didn't know that its default operation is merge, not rebase. What should I do now, should I close the PR and submit a new one? Or is there another way? Should I not execute update branch? I thought this would cause conflicts, so I operated this button.
Image_20240515174708

@frenck
Copy link
Member

frenck commented May 15, 2024

I executed the update branch on github, but I didn't know that its default operation is merge, not rebase.

I know you did, the logs tells us. I didn't understand why and was asking about that. Was there something wrong? Why was it needed to merge the branch?

@s1eedz
Copy link
Author

s1eedz commented May 15, 2024

I executed the update branch on github, but I didn't know that its default operation is merge, not rebase.

I know you did, the logs tells us. I didn't understand why and was asking about that. Was there something wrong? Why was it needed to merge the branch?

I see that the branch is out-of-date,and then there's an update button, so I. . . .. . . .Maybe I can discard these merge commits through git operations, and I'll learn how to do that. . .this may take a while...

@frenck
Copy link
Member

frenck commented May 15, 2024

The PR was approved, you made changes by updating the branch. This causes the CI to require a new approval and uses CI resources to test/validate your PR again.

Normally, there is no need for this, unless there is a conflict or change (or weeks have passed).

Considering that, I assumed something has changed... if not, then please don't do that. Thanks 👍

../Frenck

@s1eedz
Copy link
Author

s1eedz commented May 15, 2024

unless

Thank you for telling this, I'm sorry for this.

@c0ffeeca7
Copy link
Contributor

@s1eedz, what are you trying to do? Why did you close this PR now?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaits-parent Awaits the merge of an parent PR has-parent This PR has a parent PR in a other repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants