Reflex Revolution
Android application made during an introduction class to mobile application development.
Contributors
Hailey Savoie
Carter Moore
Frederic Verret
Development Process Workflow
main
1. Make a new feature branch from git fetch
git checkout -b
origin/main
git push -u origin HEAD
- Replace
refactor-authentication
,user-content-cache-key
,make-retina-avatars
) so that others can see what is being worked on. push -u
is an easy way to push the branch to the remote repository and get the "upstream tracking" set up correctly.- Remember to move the Trello card to "Doing".
2. Implement feature
- Remember to commit & push often as you make changes and work on the feature.
- If others are also working on the same branch as you, you might need to pull their changes using
git pull
(orgit pull --rebase
). - If other PRs are merged into
main
before yours, you will need to pull the new changes frommain
usinggit pull origin main
.
3. Create pull request
Go to our repository page, select your branch, then select "Compare & pull request".
- Make sure the base branch is
main
(this means your work will be merged intomain
). - Add a title (what feature did you work on?), and a description if you have details to add.
- If your code is ready for review, click "Create Pull Request". If you are not done working on it, use the dropdown and select "Create Draft Pull Request" (once you are done, you can mark it as ready for review).
- Remember to move the Trello card to "Code Review"
4. Review process
- Each PR need at least 2 review (another dev does an overview of your code to make sure there are no major issues/things missing).
- The reviewer(s) may pull the branch locally and try running the app to verify the functionality.
- If found issues, they will tell the developer via GitHub review comments.
- If tester has not found issues, they will approve the request
- The request can be merged (by anyone) once it has 2 reviews. Once merged, move the Trello card to "Done"
- Good job!