-
Notifications
You must be signed in to change notification settings - Fork 13
Development Workflow
The two main branches for PawPrints are develop and master. The develop branch should be the most up to date code and code that is currently in the staging environment. The master branch is for code that has been confirmed "stable" and deployed to production. Generally all bugs and features will be merged to the develop branch which will then be deployed to staging and tested. Once the develop branch has been confirmed to be working properly, it should be merged to master and deployed to production.
If you are working on a bug or feature, you should create a new branch based off develop and name it something descriptive related to the thing you are working on.
When you are done working on your bug or feature, you should squash all your commits into one (or ensure whoever is merging uses the Github squash/merge button) and open a Pull Request against the develop branch.
IMPORTANT
If you make any changes to a models.py file, you need to make sure you run the makemigrations command. To do this, ensure the containers are running, and run the following command against the web container,
docker exec -it pawprints_web_1 python manage.py makemigrations
This command will generate a migration file which you should commit along with your work.
When you edit the Dockerfile make sure you run docker-compose build before you bring the project back up with docker-compose. So run the command docker-compose up -d --build