... | ... | @@ -33,7 +33,10 @@ Between releases, code to be deployed in testing instances should always be merg |
|
|
|
|
|
Assuming you have set the lab.allmende.io upstream as origin, run:
|
|
|
|
|
|
$ git checkout -b deployment origin/deployment
|
|
|
git checkout -b deployment origin/deployment
|
|
|
|
|
|
You should see:
|
|
|
|
|
|
Branch deployment set up to track remote branch deployment from origin.
|
|
|
Switched to a new branch 'deployment'
|
|
|
|
... | ... | @@ -48,11 +51,25 @@ Assuming that you kept the upstream and local in sync, you can opt to: |
|
|
|
|
|
#### Merge on lab
|
|
|
|
|
|
Push your branch to lab:
|
|
|
|
|
|
git push --set-upstream origin is49
|
|
|
|
|
|
Then:
|
|
|
|
|
|
1. Go to the activity stream
|
|
|
1. Click on link to issue merge request
|
|
|
1. Select deployment instead of master for comparing branches
|
|
|
1. Merge them, if there are no conflicts (otherwise check below)
|
|
|
|
|
|
#### Merge locally
|
|
|
|
|
|
$ git checkout deployment
|
|
|
$ git merge is49
|
|
|
git checkout deployment
|
|
|
git merge is49
|
|
|
|
|
|
And to keep the lab repository up-to-date:
|
|
|
|
|
|
git push
|
|
|
|
|
|
## Dealing with conflicts
|
|
|
|
... | ... | @@ -60,7 +77,7 @@ If the code has meanwhile been changed by commits merged into the branch later t |
|
|
|
|
|
Check out where are the conflicting files:
|
|
|
|
|
|
$ git status -v
|
|
|
git status -v
|
|
|
|
|
|
Edit the file(s) with your favorite text editor or IDE.
|
|
|
|
... | ... | @@ -77,15 +94,15 @@ Everything between << == >> needs to be manually resolved. Please note that |
|
|
|
|
|
Once you are done inspecting the file logic and merging everything coherently, do:
|
|
|
|
|
|
$ git add [Alt + .]
|
|
|
$ git commit
|
|
|
$ git push
|
|
|
git add [Alt + .]
|
|
|
git commit
|
|
|
git push
|
|
|
|
|
|
## Launch the deployment magic!
|
|
|
|
|
|
As you have your new commit, just do:
|
|
|
|
|
|
$ git push dokku deployment:master
|
|
|
git push dokku deployment:master
|
|
|
|
|
|
This is pushing the deployment branch to dokku remote master, as it only recognizes master branches.
|
|
|
|
... | ... | |