search

NYCPlanning / deprecated-labs-zap-api

Deprecated version of the ZAP API, see https://github.com/NYCPlanning/labs-zap-api
Other
5 stars 3 forks source link

435: Add a retry to the api call in new-filed update script; fix hand… #98

Closed hannahkates closed 5 years ago

hannahkates commented 5 years ago

…ling of null ulurp numbers

ghost commented 5 years ago

did you squash develop for this merge? i think we want to leave the separate commits separate in master, & diff should be 2 commits, not 1

hannahkates commented 5 years ago

I did squash, but that make sense that it wasn't needed. Tests are failing and I don't know why. I pulled the latest from both master and develop before rebasing.

ghost commented 5 years ago

Tests aren't failing, the deployment fails because you're trying to push a new commit lineage that diverges from what exists in remote for dokku staging due to the squash. I would try this again without the squash as that's what breaking things 

Warning: Permanently added the ECDSA host key for IP address '45.55.119.18' to the list of known hosts.

To dokku@zap-api.planninglabs.nyc:zap-api-staging
 ! [rejected]        develop -> master (fetch first)
error: failed to push some refs to 'dokku@zap-api.planninglabs.nyc:zap-api-staging'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Exited with code 1