search

CEIDatUGA / COVID-19-DATA

GNU General Public License v3.0
4 stars 6 forks source link

Merge conflict in province-master.csv #35

Closed atredennick closed 4 years ago

atredennick commented 4 years ago

There appears to be a merge conflict in the province-master.csv file. The HEAD notifier is on the second line.

mvevans89 commented 4 years ago

thanks! I'm hoping this will be fixed by the autoupdate at 8 pm tonight, but it not I'll take a look at it

atredennick commented 4 years ago

Great! I also found a merge conflict in the prefecture CSV (somewhere around line 6000). Sounds like that will probably also be fixed by the autoupdate. Thank you!

mvevans89 commented 4 years ago

I think this has been fixed now. Forgot to tag the issue in the commit, but waiting to see if the github action successfully goes through tonight. If so, then I will close this issue

arw36 commented 4 years ago

Seems like github action worked? and I just need to manually fill in the other dates (April 8th - 11th?) But perhaps time a little off since it pulled Aug 12th already? Either way it should just overwrite if we delete that html from the folder.

mvevans89 commented 4 years ago

I just ran it manually to deal with merge issue. I think it was from a while ago which was why the github action had been failing, but I had searched the files for the HEAD text and couldn't find it before. I basically just ran your script and completely wrote over the master csv's to get everything back on track. Re: the automatic china scraping I'm going to make a new issue to track that