-
Notifications
You must be signed in to change notification settings - Fork 1
Branching
master is what is deployed to production. This branch is protected.
next is deployed to beta/staging. This branch is also protected. We will merge this branch to master when we
feel like it is time to release all of the new features. This branch does not technically need to be "clean".
We encourage branching by feature or by issue.
If you would like to work on a feature, checkout a new branch from next and give it a developer-friendly name like feature-rsvp-emails. This could signal developers that it may have something to do with creating a feature to let students rsvp to events through email
If you would like to work on an issue, checkout a new branch from next and give it a reference-friendly name like ACM-25. That way, anyone working on this issue knows exactly what the branch is trying to fix
We will run your PR through integration and unit tests in staging. If it passes we will squash and merge it into next