a platform where students, volunteers, and members can ask and answer each other's questions, vote on which answers are best, and generally self-moderate.
Merge in dev When Kushi is ready to do new testing, she pushes dev to testing Kushi tests the code in testing, until she is happy with it she would it move it to mater If she is not happy and something needs to be fixed, fix needs to go to directly in testing The update in test need to be duplicated in the dev branch so it is not lost. Once testing is complete, code is pushed to master, master is demo only branch until another better version is ready.
Test Procedure git branch git checkout test git pull origin dev -X theirs :wq