search

pgh-public-meetings / city-scrapers-pitt

Pittsburgh City Scrapers: sourcing public meetings in Pittsburgh
https://pgh-public-meetings.github.io/events/
MIT License
19 stars 66 forks source link

[WIP] Created Alcosan Scraper files -- MAG. #140

Closed mgermaine93 closed 3 years ago

mgermaine93 commented 4 years ago

Created Pitt Alcosan Scraper files. Still have work to do.

bonfirefan commented 4 years ago

Hey there - try syncing your updates to latest with 

git fetch upstream
git merge upstream/master

You may have some pipfile and pipfile lock conflicts - try to keep the changes from upstream with git checkout --theirs -- <filename> on any merge conflicts.

mgermaine93 commented 4 years ago

Hi Bonnie -- I tried the two commands you listed and it's saying everything's already up-to-date on my end. Perhaps I'm missing something? Thank you for being patient as I work through this. I still have some significant work to do on the spider itself in order to get it running properly, fyi. What do you mean by git checkout --theirs -- ?

ben-nathanson commented 3 years ago

Closing as there hasn't been updates on this in a while. Happy to reopen if there are new developments.