Proposed work flow:
-
Look at issues for things to work on and assign them to yourself, or create your own issue and assign it to yourself
-
Create a new branch with the name in the form yourname/issue_name to work on the issue
-
Once you’re ready to merge, assign someone else to review/test your code before merging your issue branch with master. If you tag me, I’ll get back to you within 24 hours.
-
REMEMBER to rebase your work with the most updated version of master BEFORE merging. pls.
Initial Setup:
since secrets.yml is not committed, my work-around is to create a new rails app by ‘rails new test_app` then create a new secrets.yml file under data-hive/config, and copy the content of test_app/config/secrets.yml over to our new file.
Database creation & initialization:
-
‘cd data-hive`
-
‘brew update`
-
‘brew install pg`
-
‘sudo bundle install`
-
‘rake db:migrate`
Running local server:
‘rails s -p 3000`
-
git branch my_branch#creates the branch -
git checkout my_branch#now you are in your branch -
do all the editing that you want, add and commit
-
git push origin my_branch#pushes the branch to the remote (here the name of the remote is origin) -
git checkout master#now you are in the master branch -
git pull origin master#update the master branch with the remote -
git merge my_branch#my_branch is now being merged to master -
git push origin master#push the master branch that was merged with my_branch