CONTRIB.md uses numbered lists, which means that people wanting to update CONTRIB.md will all add their entries in the next available number. Thus, nearly all PRs will have merge conflicts as everyone adds their entry to the next available number on master branch. In current state, only the next immediate PR accepted can be merged cleanly.
I suggest changing the numbered lists in CONTRIB to unordered lists, using "+" or "-" as bulletpoints instead. As long as everyone only adds their own line in their PRs, all future PRs can be merged cleanly. As for the current outstanding PRs, merging is no issue once people update their PRs accordingly to match the format.
Just to be explicit with what I mean, here is the before:
1) [[Git repo]](https://github.com/aminhusni/project_kururugi_offline)
[[Live Version]](https://kururugi.blob.core.windows.net/kururugi/index.html)
Project Kururugi, by Amin Husni. Analysis and plotting of vaccination data.
2) [[Git repo]](https://github.com/leeliwei930/citf-express-api)
CITF Express API server, by [Li Wei Lee](https://techrino.net). A RestFUL API server written in NodeJS to parse the CSV-formatted data into JSON format, allowing for a variety of query via HTTP requests.
3) [[Live Version]](https://twitter.com/MYVaccineCount)
Malaysia Vaccine Tracker Twitter Bot, by [Henry Lim](https://twitter.com/henrylim96). Auto-tweets daily COVID-19 vaccination progress for the country, as well as each state.
And here is the after:
+ [[Git repo]](https://github.com/aminhusni/project_kururugi_offline)
[[Live Version]](https://kururugi.blob.core.windows.net/kururugi/index.html)
Project Kururugi, by Amin Husni. Analysis and plotting of vaccination data.
+ [[Git repo]](https://github.com/leeliwei930/citf-express-api)
CITF Express API server, by [Li Wei Lee](https://techrino.net). A RestFUL API server written in NodeJS to parse the CSV-formatted data into JSON format, allowing for a variety of query via HTTP requests.
+ [[Live Version]](https://twitter.com/MYVaccineCount)
Malaysia Vaccine Tracker Twitter Bot, by [Henry Lim](https://twitter.com/henrylim96). Auto-tweets daily COVID-19 vaccination progress for the country, as well as each state.
CONTRIB.md uses numbered lists, which means that people wanting to update CONTRIB.md will all add their entries in the next available number. Thus, nearly all PRs will have merge conflicts as everyone adds their entry to the next available number on master branch. In current state, only the next immediate PR accepted can be merged cleanly.
I suggest changing the numbered lists in CONTRIB to unordered lists, using "+" or "-" as bulletpoints instead. As long as everyone only adds their own line in their PRs, all future PRs can be merged cleanly. As for the current outstanding PRs, merging is no issue once people update their PRs accordingly to match the format.
Just to be explicit with what I mean, here is the before:
And here is the after:
A similar changed has been proposed in the COVID data repo, which has been accepted: https://github.com/MoH-Malaysia/covid19-public/issues/157