search

unikent / of-course

Of Course! is an opinionated API front-end for consuming programmes data.
Other
1 stars 1 forks source link

Branch naming and usage #1004

Closed cfc7-unikent closed 5 years ago

cfc7-unikent commented 6 years ago

@jtisqo @samyapp @theninja @markfendley @gnozu

We seem to be using the beta branch as the master and develop branch for this repo. Looking at the deploy script I see we are deploying to test and live from beta.

I've no idea why, does anyone know? I get confused everytime.

If there's not a reason for it I suggest that we change the development workflow here to match our other repos. Something like...

  1. merge all the changes from beta into master,
  2. update the deploy scripts and remove the beta branch,
  3. branch off develop for fixes and features - use develop for testing (and deploying to test from develop)
  4. merge reviewed and approved changes from develop into master (and deploying to live from master)
cfc7-unikent commented 5 years ago

Resolved by https://github.com/unikent/of-course/pull/1017