devsnippets
devsnippets copied to clipboard
Merge outstanding PR's from Hacktoberfest last year
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! 😃
I can help with merging the PR's @rickwest . How should I start with this? 🤔
Hi, @rickwest I can help with the merging, what's the next action?
@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?
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
I can help with this @rickwest :)
@piratelicorne sure, that would be amazing! Feel free to get stuck in and just let me know if I can help with anything!