|
|
While we are moving towards the master branch of acc being the standard repository to use for apps (as it should be), tuneX in its current deployment runs on beta and uses the beta branch of acc. To update tuneX to use new tunes or paths added to acc, you need to merge master into staging and beta and push them:
|
|
|
|
|
|
First master into staging and deploy:
|
|
|
```
|
|
|
$ cd /path/to/acc/
|
|
|
$ git checkout master
|
|
|
$ git pull
|
|
|
$ git checkout staging
|
|
|
$ git pull
|
|
|
$ git merge master
|
|
|
$ git push
|
|
|
```
|
|
|
Then merge staging into beta and deploy:
|
|
|
``
|
|
|
$ git checkout beta
|
|
|
$ git pull
|
|
|
$ git merge staging
|
|
|
$ git push
|
|
|
```
|
|
|
Don't forget to switch back to the master branch when you are finished:
|
|
|
```
|
|
|
$ git checkout master
|
|
|
``` |