These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
Clone the repository (https://help.github.com/articles/cloning-a-repository/)
git clone https://github.com/RTGS-Lab/QualityAirQualityCitiesInside of your project folder (after clone):
Note: the secrets file is in the .gitignore and should never be uploaded to GitHub
An issue will be assigned to you via GitHub. Your workflow begins after assignment:
- Create a branch based on the
mainbranch with your initials and the issue number as the branch name (e.g. EB-5):git checkout -b EB-5 - Work on the issue.
- Add your changes:
git add . - Check that your files were added as expected:
git status - Frequently commit your work to your local branch. Use simple, short, and descriptive messages with a verb describing the work. Include the issue number. Example:
git commit -m "#5 added styling"
- Add your changes:
- Update the CHANGELOG.md to describe your work.
- Ensure your code is synced with the latest version of the
mainbranch:- Use this command:
git pull origin main - If there are no merge conflicts, the updates made to the
mainbranch will be incorporated into your local branch automatically. - If there are merge conflicts, you will need to resolve conflicts manually. Please be careful with this step so that no code is lost. Once complete, you will need to add your changes:
git add .and then commit again:git commit -m "add message here"
- Use this command:
- Push your committed and synced branch to the remote repository on GitHub:
git push origin JEB-5 - Submit a Pull Request:
- Request that your branch be merged into the
mainbranch. - Name the Pull Request in this format: "Fixes #5 - Issue Description".
- Use keywords to automatically close issues (e.g. "Closes #5).
- Assign a reviewer (typically the lead developer).
- Request that your branch be merged into the
- Once your Pull Request is reviewed, address any feedback that needs to be addressed. Once you have addressed feedback, click the button to re-request review.
- Upon approval of the Pull Request, your issue will be merged into the
devbranch and you can start on a new issue.
Check this out if your having a git of a problem... This is a more basic cheatsheet.
- Bryan Runck - Project Advisor - Senior Research Scientist (R7), GEMS Informatics Center
- Jake Ford - Developer - University of Minnesota - Geographic Information Science Program - Extentsion of Quality Air / Quality Cities
- Rob Hendrickson - Developer - University of Minnesota - Geographic Information Science Program - Extentsion of Quality Air / Quality Cities
- Lauren Roach - Developer - University of Minnesota - Geographic Information Science Program - Extentsion of Quality Air / Quality Cities
- Taylor Andersen-Beaver - Developer - University of Minnesota - Geographic Information Science Program - Extentsion of Quality Air / Quality Cities
- Ethan Bott - Developer - University of Minnesota - Geographic Information Science Program - Extentsion of Quality Air / Quality Cities
