Comments (1)
To ensure that you're not overwriting anything that is in origin/master but not locally, you can create a local shell function. In the simplest form, it would look like this:
function deliver_sync() {
git pull && deliver "$@"
}
Resolving conflicts between multiple origins would be very difficult to automate. The main idea is that if it's not in origin (github, bitbucket etc.), it can (and will) be overwritten.
The current approach ensures quick fixes are a snap to push into production:
- Fix locally
- Deliver (regardless of origin)
Eventually, you would make the fix pretty and commit to origin. When CI pushes new code out, it will overwrite anything that it doesn't know about.
from deliver.
Related Issues (20)
- Static assets pushed to separate hosts HOT 1
- Rename SERVERS to HOSTS HOT 1
- PORT variable doesn't work HOT 6
- error in git push HOT 6
- Host keys are breaking in git_submodules()
- Authorize remote hosts explicitly
- Authorizing multiple hosts on initial deliver freezes HOT 1
- SIGINT during git push does not stop gracefully HOT 1
- Generated strategy tries to push wrong revision HOT 1
- Illumos / smf support HOT 1
- Deliver requires /usr/bin/sh to be bash HOT 1
- Foreman, exports and init control HOT 1
- foreman export upstart tmp HOT 2
- bug in launch HOT 1
- tag v0.8.0 HOT 2
- Timeout during npm install HOT 4
- Does deliver support rollback? HOT 1
- Staging / Testing HOT 1
- Request: make it installable through npm HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from deliver.