Working with git - mnth-titan-robotics/titan-2020 GitHub Wiki
Instructions
Downloading to your computer
git clone https://github.com/mnth-titan-robotics/titan-2020.git
Creating a new branch
- Switch to master -
git checkout master
- Download all of the updates that have been made to master since you last used it -
git pull origin master
- Create your branch -
git branch foo
Writing robot code
- Switch to the branch you want to work on -
git checkout foo
- Write code
- Add any new files you created to be tracked by git -
git add .
- Commit your changes -
git commit -am "your commit message"
- Push your changes to GitHub -
git push origin foo
Creating pull requests (PRs)
- Go to the Branches page for this repository
- Find your branch - e.g.
foo
- and click "New pull request"
- Click "Reviewers" and add everyone on this project as a reviewer. You can find the full list below.
- Click "Create pull request"
Merging pull requests
- Message the programming team on Slack to let them know that there is a PR up for review
- When two people have approved your PR, click "Squash and merge"
- Everyone who's working in other branches need to pull in the changes -
git pull origin master
Reviewers
- adrianantonmasloc
- bohdi00707
- kchenweijie
- kindelin