Maintenance

[Cutwell]

Hi All,
I mentioned before that I'm happy to maintain this repo (i.e.: accept PR's) myself, however I didn't anticipate this level of involvement (over 1200 PR's at time of writing).
Hacktoberfest is pretty much over, but if anyone would be interested in accepting a few Pull Requests I'd be happy to grant permissions.
Cheers, Cutwell

[vrajroham]

I would help you!

[platy11]

@Cutwell I'm happy to help

[Cutwell]

@vrajroham @platy11, you've both been added - thanks for the help!

[vrajroham]

@Cutwell It's going tobe hard to merge the PR by multiple collaborators. I started merging from last PR. (Means who opened first) As I resolve conflict other conflict occurs for same PR and goes on. Because maybe other user had written on same line or other contents are there already.

[Cutwell]

@vrajroham I agree, I've looked into some form of automation - i.e.: comparing the main branch and PR for differences, then adding the differences to the main branch, but automating with Git is annoying

[christianheinrichs]

@Cutwell I would like to help out!

[shreyanshdwivedi]

@Cutwell I would like to help

[MichaelDeBoey]

If help is still needed, I'm in for it 🙂

[Cutwell]

@MichaelDeBoey @shreyanshdwivedi @christianheinrichs thanks for the offer! All added as collaborators.

[platy11]

@Cutwell How do you want to go about merging the PRs? Because now that the census is in a seperate file, each PR wants to add the whole census to README.md again. What I did with some PRs was fix the merge conflict so the new name was added to the README, and then I made a commit copy/pasting them to the 2017.md file.

[m1guelpf]

@Cutwell If you still need help, count me in!

[MichaelDeBoey]

@Cutwell Like @platy11 said, it's maybe a good thing to tell us how you would like that we work this out for you. 🙂

[Cutwell]

Hmm, my bad there. The easiest method may be to re-add the entire census to readme.md then move it to a seperate file at a future point.

Edit: The readme.md file now contains the census, just accept PR's into it as before, thanks!

[christianheinrichs]

@Cutwell Thanks for adding me to the collaborators.

Most of the PR merge conflicts could be resolved fairly easily via the web interface. However, for some reason an entry sometimes gets removed which then has to be re-added manually and I don't exactly know why, since this is the first time I'm merging pull requests on GitHub.

This happened in the commits 76f5fde, c9f6c24 and 8cdf80f.

If anyone can help out with this, please post in this thread.

[Cutwell]

@christianheinrichs Mind posting a screenshot to show what you mean?

[ajesusflores]

I manually resolved conflicts for my PR: #1089

[platy11]

@ajesusflores Thanks, I've merged it now. 👍

[danedavid]

I have resolved conflicts in my PR too, if that helps #966 👍 If you need further help, count me in.

[spences10]

Hey @Cutwell you still need help with this?

Everyone seems to have quietened down and there's still a good 1k PRs to merge, fi you want to add me as a contributor I'll tackle some of them 👍