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.

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

update icon: twitter (original) #1912

Merged
merged 6 commits into from
Oct 24, 2023
Merged

update icon: twitter (original) #1912

merged 6 commits into from
Oct 24, 2023

Conversation

Yashh56
Copy link
Contributor

@Yashh56 Yashh56 commented Oct 19, 2023

New Twitter icon was added in SVG form #1890

altnames was also added in devicon.json

#1909

@Yashh56 Yashh56 changed the title update icon: twitter (original, original-wordmark) update altname of twitter (original, original-wordmark) Oct 19, 2023
Snailedlt
Snailedlt requested changes Oct 19, 2023
View reviewed changes
Copy link
Collaborator

@Snailedlt Snailedlt left a comment

Choose a reason for hiding this comment

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

This is still based on the master branch it seems. Notice the conflicts
image

and the updated workflows file:
image

@Snailedlt Snailedlt mentioned this pull request Oct 19, 2023
Closed
@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 19, 2023

How should I resolve this ? I change the base branch to develop

@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 19, 2023

update altname of twitter (original, original-wordmark) by Yashh56 · Pull Request #1912 · devicons_devicon - Google Chrome 10_19_2023 8_39_10 PM
update altname of twitter (original, original-wordmark) by Yashh56 · Pull Request #1912 · devicons_devicon - Google Chrome 10_19_2023 8_39_44 PM

@Snailedlt
Copy link
Collaborator

You need to either:

  1. Remove the commit that's from the master branch
  2. Make a new branch based on the develop branch... That is, checkout the develop branch and create a new branch from there: git checkout develop && git pull && git checkout -b your_branch_name

@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 19, 2023 •
edited
Loading

@Snailedlt review these changes please

@Snailedlt Snailedlt changed the title update altname of twitter (original, original-wordmark) update icon twitter (original, original-wordmark) Oct 19, 2023
Snailedlt
Snailedlt previously approved these changes Oct 19, 2023
View reviewed changes
Copy link
Collaborator

@Snailedlt Snailedlt left a comment

Choose a reason for hiding this comment

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

Looking good! Thank you for your contribution! 💯

@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 20, 2023

when will the PR get merged ? @Snailedlt

@Snailedlt
Copy link
Collaborator

@Yashh56 when it has at least 2 approvals from the maintainers :)

@Snailedlt
Copy link
Collaborator

Looks like the PR still has merge conflicts though

@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 20, 2023

How should I resolve this I want to merge atleast 4 PR till this October end for hacktoberfest :)

@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 20, 2023

Hey Maintainer Please Review this PR :)

Snailedlt
Snailedlt previously approved these changes Oct 20, 2023
View reviewed changes
@Snailedlt Snailedlt added help wanted Use this label if you require some help on a specific topic hacktoberfest-accepted Accepted to be counted towards Hacktoberfest labels Oct 20, 2023
@Snailedlt
Copy link
Collaborator

Fixed it for you. This PR should count towards your octoberfest now :)

@Snailedlt Snailedlt changed the title update icon twitter (original, original-wordmark) update icon twitter (original) Oct 20, 2023
@Snailedlt Snailedlt requested a review from a team October 20, 2023 19:13
@Snailedlt Snailedlt closed this Oct 20, 2023
@Snailedlt Snailedlt reopened this Oct 20, 2023
@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 21, 2023

Thanks @Snailedlt :)

@Yashh56
Copy link
Contributor Author

Yashh56 commented Oct 21, 2023

What are these commits which you made ? Is my commit are incompletes ?

@Snailedlt Snailedlt changed the title update icon twitter (original) update icon: twitter (original) Oct 21, 2023
@Snailedlt Snailedlt closed this Oct 21, 2023
@Snailedlt Snailedlt reopened this Oct 21, 2023
@Snailedlt
Copy link
Collaborator

Everything is fine, just the PR title that needed to change a bit so that the checks go through. Should be fine now :)

weh
weh requested changes Oct 24, 2023
View reviewed changes
Copy link
Contributor

@weh weh left a comment

Choose a reason for hiding this comment

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

Just a really minimal change. Thx 👍

icons/twitter/twitter-original.svg Outdated Show resolved Hide resolved
@Yashh56 @weh
Update icons/twitter/twitter-original.svg
5bded88 
Co-authored-by: Patrik Wehrli <patrik.wehrli@gmail.com>
weh
weh approved these changes Oct 24, 2023
View reviewed changes
Copy link
Contributor

@weh weh left a comment

Choose a reason for hiding this comment

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

👍

@Snailedlt
remove extra newline so there's only one at eof
cdae76a 
Remove extra newline (there were two here)
@Snailedlt Snailedlt merged commit cf4c757 into devicons:develop Oct 24, 2023
5 checks passed
@Snailedlt Snailedlt mentioned this pull request Oct 24, 2023
Closed
1 task
@Yashh56 Yashh56 deleted the feat/twitter-new-icon branch November 2, 2023 03:11
@Snailedlt Snailedlt added the feature:icon Use this label for pull requests when a new icon is ready to be added to the collection label Nov 5, 2023
@Snailedlt Snailedlt mentioned this pull request Feb 5, 2024
Merged
GCHQDeveloper926 pushed a commit to GCHQDeveloper926/devicon that referenced this pull request Dec 20, 2024
@Yashh56 @Snailedlt @weh
update icon: twitter (original) (devicons#1912)
41f6a64 
* altnames was also added in devicon.json

* Fix devicon.json formatting

* Update icons/twitter/twitter-original.svg

Co-authored-by: Patrik Wehrli <patrik.wehrli@gmail.com>

* remove extra newline so there's only one at eof

Remove extra newline (there were two here)

---------

Co-authored-by: Jørgen Kalsnes Hagen <43886029+Snailedlt@users.noreply.github.com>
Co-authored-by: Patrik Wehrli <patrik.wehrli@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Snailedlt Snailedlt Snailedlt left review comments

@EnisMulic EnisMulic EnisMulic approved these changes

@weh weh weh approved these changes

Assignees
No one assigned
Labels
feature:icon Use this label for pull requests when a new icon is ready to be added to the collection hacktoberfest-accepted Accepted to be counted towards Hacktoberfest help wanted Use this label if you require some help on a specific topic
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Yashh56 @Snailedlt @weh @EnisMulic