Closed JoelAnderton closed 4 years ago
A reminder to sync this with the upstream fork so that Travis tests will past! Also, to enable edits from maintainers!
Enable edits from maintainers!:
Syncing your fork:
git remote add upstream https://github.com/bonfirefan/city-scrapers-pitt.git
git fetch upstream
git merge upstream/master
Hey there - try syncing your updates to latest with
git fetch upstream
git merge upstream/master
and delete the travis file. 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.
Closing as this has been inactive for some time. Happy to revisit when changes are made!
Welcome feedback - address issue #16