Prompt to merge your branch before deploy?
Created by: qris
Let's say I'm working on the develop
branch and I request a deploy to the staging
server, which uses the staging
branch.
Most likely I want to merge the develop
branch into staging
before deploy. I often forget to do that (my fault), so I deploy a no-op. I know that dye prompts me if the branches are different, but we're already logged into the remote server by that time, and all I can do is cancel the deploy, merge, push and deploy again.
The steps that I very often need are:
- git checkout staging
- git pull
- git merge develop
- git push
- fab.py deploy staging
- git checkout develop
Dye could actually prompt me before logging into the remote server, if my current branch is different than the one which will be deployed, whether I should merge into the target branch beforehand. This would save some manual work before each deployment.
Of course, one of these steps might fail, for example I might have local changes that would be lost if I checked out a different branch, or merge conflicts, and I'm fine with Dye aborting in that case and leaving me to sort out the mess.
Does this seem like a reasonable feature? Let me know if so, and I'll try to work up a patch.