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

Merge outstanding PR's from Hacktoberfest last year #154

Open
rickwest opened this issue Oct 2, 2020 · 6 comments
Open

Merge outstanding PR's from Hacktoberfest last year #154

rickwest opened this issue Oct 2, 2020 · 6 comments

Comments

@rickwest
Copy link
Owner

@rickwest rickwest commented Oct 2, 2020

I'd love some help with with getting the outstanding PR's from Hacktoberfest last year merged and just generally tidying this project up! If anyone wants to help, let me know and I'll do my best to facilitate it! 😃

@guptabhaskar
Copy link
Contributor

@guptabhaskar guptabhaskar commented Oct 2, 2020

I can help with merging the PR's @rickwest . How should I start with this? 🤔

@bankole175
Copy link

@bankole175 bankole175 commented Oct 3, 2020

Hi, @rickwest I can help with the merging, what's the next action?

@rickwest
Copy link
Owner Author

@rickwest rickwest commented Oct 5, 2020

@guptabhaskar @bankole175 Thank you, will be great to have your help. Most of the PR's are unable to be merged due to conflicts that need resolving, looking at them the majority of the, are Javascript snippets.

I think the best process to resolve the issues is to checkout the branches, rebase them and then merge/resolve the conflicts. Then push the new commits up to that same branch and I will get them merged ASAP. How does that sound?

@guptabhaskar
Copy link
Contributor

@guptabhaskar guptabhaskar commented Oct 5, 2020

Sounds good to me. 👌
I got a lot of course work to do this week. I will try to recreate the same problems on a trial repo and solve them on my own for now. Then, I can start helping from next week. @rickwest

@piratelicorne
Copy link

@piratelicorne piratelicorne commented Oct 10, 2020

I can help with this @rickwest :)

@rickwest
Copy link
Owner Author

@rickwest rickwest commented Oct 11, 2020

@piratelicorne sure, that would be amazing! Feel free to get stuck in and just let me know if I can help with anything!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
4 participants
You can’t perform that action at this time.