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: merge conflicts for Neo4j and Clueless swag #652

Merged
merged 4 commits into from
Oct 7, 2022
Merged

fix: merge conflicts for Neo4j and Clueless swag #652

merged 4 commits into from
Oct 7, 2022

Conversation

kev-odin
Copy link
Contributor

@kev-odin kev-odin commented Oct 7, 2022

Thanks for contributing to the Hacktoberfest Swag List 😃 🎉! Before submitting your pull request, please check off as many of the items below as you can:

  1. I have read the Contributing.md file and formatted this PR correctly
  2. I'm not adding a company from the blocklist
  3. I make sure to fix things promptly if an error or suggestion comes up

Thanks and Happy Hacktoberfest! 🎉
Tagging @crweiner to take a look. 👀

Fixes conflicts introduced in #645 and #650

docs/list.md Outdated Show resolved Hide resolved
@ghost
Copy link

ghost commented Oct 7, 2022

👇 Click on the image for a new way to code review
  • Make big changes easier — review code in small groups of related files

  • Know where to start — see the whole change at a glance

  • Take a code tour — explore the change with an interactive tour

  • Make comments and review — all fully sync’ed with github

    Try it now!

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map Legend

@netlify
Copy link

netlify bot commented Oct 7, 2022

Deploy Preview for hacktoberfest-swag-list ready!

Name Link
🔨 Latest commit
🔍 Latest deploy log https://app.netlify.com/sites/hacktoberfest-swag-list/deploys/63406a0c528a4230921c8b8c
😎 Deploy Preview https://deploy-preview-652--hacktoberfest-swag-list.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

- [College API](https://github.com/Clueless-Community/collegeAPI){:target="_blank"}
- [Prega.io](https://github.com/Clueless-Community/Prega){:target="_blank"}
- [Datasets](https://github.com/Clueless-Community/Datasets){:target="_blank"}
- Earn points for your contributions:
Copy link
Owner

Choose a reason for hiding this comment

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

Can you please point to where you see info regarding these points? I'm having a hard time verifying this part of the entry. What are the points for? The shirt to the top contributors?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I found it in the Clueless repository.
The shirt seems to be for the top contributor and there is other swag available in the shop. I think.

Copy link
Contributor

Choose a reason for hiding this comment

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

The point system and top contributor part is provided on their org github page
https://github.com/Clueless-Community#how-points-are-distributed

I know, the details for the event are scattered all over the place 😆

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The point system and top contributor part is provided on their org github page

https://github.com/Clueless-Community#how-points-are-distributed

I know, the details for the event are scattered all over the place 😆

Yep. I am glad I went through the repository! That's why we have this awesome repository to consolidate all the information in one place.

@crweiner and @vimode we are doing cool stuff :)

Copy link
Owner

Choose a reason for hiding this comment

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

Ahh, thank you. So it's just a leaderboard, like SendGrid used to have? That Readme says the "Top contributors will be winning amazing t-shirt and swags.", so it sounds like there will be a points requirement of some sort for the shirt. I guess they haven't figured out a points threshold yet? If you happen to see a points requirement for the shirt anywhere, @kev-odin or @vimode, please let me know!

Copy link
Contributor

@vimode vimode Oct 7, 2022

Choose a reason for hiding this comment

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

  • One has to signup to their website and create a profile.
  • When your PR is merged, login to the clueless website > get your profile link by going to your profile page.
  • Comment in the merged PR your profile link and tag the maintainer who merged.
  • This will update your rankings on the clueless website.

Top ranked contributors at the end of the month will win the prizes.

Heres an example merged PR Clueless-Community/clueless-official-website#217

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right. I think it is a contest for contributions. Not sure if there a point requirement for the shirt as it will be determined at the end. I will periodically check in with them.

I need more coffee or need to stop fixing merge conflicts at 1 am lol

@codeclimate
Copy link

codeclimate bot commented Oct 7, 2022

Code Climate has analyzed commit 404878d and detected 0 issues on this pull request.

View more on Code Climate.

Copy link
Contributor Author

@kev-odin kev-odin left a comment

Choose a reason for hiding this comment

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

Screenshot from 2022-10-07 10-59-00

- [College API](https://github.com/Clueless-Community/collegeAPI){:target="_blank"}
- [Prega.io](https://github.com/Clueless-Community/Prega){:target="_blank"}
- [Datasets](https://github.com/Clueless-Community/Datasets){:target="_blank"}
- Earn points for your contributions:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I found it in the Clueless repository.
The shirt seems to be for the top contributor and there is other swag available in the shop. I think.

- [College API](https://github.com/Clueless-Community/collegeAPI){:target="_blank"}
- [Prega.io](https://github.com/Clueless-Community/Prega){:target="_blank"}
- [Datasets](https://github.com/Clueless-Community/Datasets){:target="_blank"}
- Earn points for your contributions:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The point system and top contributor part is provided on their org github page

https://github.com/Clueless-Community#how-points-are-distributed

I know, the details for the event are scattered all over the place 😆

Yep. I am glad I went through the repository! That's why we have this awesome repository to consolidate all the information in one place.

@crweiner and @vimode we are doing cool stuff :)

@crweiner
Copy link
Owner

crweiner commented Oct 7, 2022

Thank you @kev-odin for your PR to add ClueLess and Neo4J to the Hacktoberfest Swag List! And thank you to @vimode for jumping in to assist!

teamwork

Let's get them on the Swag List so we can send great PRs their way. 👍 Have a great Hacktoberfest! 🎃

P.S. : This is a first PR merge after I removed the requirements for the {:target="_blank"} attribute. See PR #659 for the plugin and deploy update I made. Keep your fingers crossed that it'll re-write these links to add the right attributes when this is merged. 🤞

@crweiner crweiner added the hacktoberfest-accepted Approved for Hacktoberfest label Oct 7, 2022
@crweiner crweiner merged commit f671b92 into crweiner:master Oct 7, 2022
@crweiner
Copy link
Owner

crweiner commented Oct 7, 2022

Yay, it worked!

image

@vimode
Copy link
Contributor

vimode commented Oct 7, 2022

The markdown files look so much clean in the repo now 🤩
Amazing work with the plugin @crweiner !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hacktoberfest-accepted Approved for Hacktoberfest
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Neo4j to the Hacktoberfest Swag List Add ClueLess to the Hacktoberfest Swag List
3 participants