git checkout <frontend/backend/sources/database>
switch to the branch of your rolegit checkout -b <your branch name>
create your own branch (e.g. Nate, better if name after your name)git push origin <your branch name>
push your newly created branch to the REMOTE repository
- Always work on our own branches when developing. (use
git checkout <your branch name>
in your project directory)
Don't directly work on the master branch or the frontend/backend/sources/database branch. - After fully testing your code, use the following steps to push to your branch remotely on github so that others can integrate your code into their own branches
git add .
or
git add <filenames of the files that you newly created, such as index.html>
)git commit -m <some description about why you are pushing these files to the remote branch so that others can understand what you are doing in this update, and it would also be helpful if we later want to reset to this update>
git push origin <your branch name, such as Nate>
- Tell others on Slack that you just pushed your code on your branch (if you think is necessary to merge your code into others'), so that someone can merge it into
frontend/backend/sources/database branch
AND
then master branch - After someone merges it into the master branch, please use
git pull origin master
to integrate the updated part into your project.
- If we want to test the project, we can test it on the master branch
- If we implemented, improved, or modified some important functionalities (such as if we updated a machine learning function or created a new user interface in frontend), and everything goes well on the master branch, then we can create a new branch called
release-<version number>
. This makes it easier for us to go back to a version if we find something goes wrong in the future development.