Fix deploy-indra - Githubissues

connext / indra

[LEGACY] Monorepo containing everything related to the core Connext protocols and network.

MIT License

84 stars 38 forks source link

Fix deploy-indra #259

Closed bohendo closed 5 years ago

bohendo commented 5 years ago

Had an ugly issue w merge conflicts. The indra deploy script should not push if there's a merge conflict or exit leaving the dev w a half-completed merge attempt.

Instead, it should roll-back the attempted merge & tell the user to:

try to merge master into staging
fix merge conflicts
push new merge commit to origin/staging
run the deploy-indra script again

bohendo commented 5 years ago

Final fix to close this issue on commit 4ff7bfdb0c97690e0a4b63389bea0d2fd4fa5ff5