Git work flow - Geo-Gecko/DES_dashboard_project GitHub Wiki

Welcome to the DES_dashboard_project wiki!

First things first:

• There are two main branches off of which work is to be done; master and develop branch.
• To update the master branch, an administrator of this project will periodically merge develop into master.
• To update develop, pull-requests are to be raised.

Here is how to create a pull-request;

• First make sure the develop branch is up-to-date. git checkout develop git pull origin develop
• If you're just beginning to work, create a branch off of develop. git checkout -b develop.
• If ,however, you already have a branch, run git rebase develop to update your branch commits so that your branch is up-to-date with develop.
• Should the output indicate existence of conflicts, reach out to the create of this wiki :).
• After all that, commit any changes you've made and push. git push origin your-branch
• On GitHub, there should be a create pull-request button on the GitHub-repository somewhere. Click it!!
• Two branches will be shown. Make sure that the first is develop and second is your-branch.
• Name of the PR and details should be relevant to the changes being introduced.
• Create the PR and request for someone to review it before having it merged.