Open dphiffer opened 7 years ago
I just wanted to stop by to give an encouraging word. You all are rock stars! Thank you for trying to solve the massive task that is WOF.
Thank you!! That is so good to hear :)
pending
bucket in S3pending
S3 bucket@dphiffer - Including the following as an FYI. Here I am manually merging two branches (pipeline should only do one branch at a time) in to staging-work
and then forgetting to pull from master
before pushing...
I am happy to be convinced that some of these steps are unnecessary but it's important that we ensure "break points" to be able to track down glitches and to roll back a branch/merge entirely.
cd /usr/local/data/whosonfirst-data
git checkout issue-784
git pull origin issue-784
git checkout staging-work
git pull origin issue-784
git push origin staging-work
git checkout issue-785
git pull origin issue-785
git checkout staging-work
git pull origin issue-785
git push origin staging-work
git checkout master
git pull origin staging-work
wof-build-metafiles
git commit -m "update metafiles" .
git push origin master
# MERGE CONFLICT BECAUSE METAFILES AND FORGETTING TO PULL FROM MASTER ABOVE...
git pull origin master
wof-build-metafiles
git commit -a
git push origin master