Git Flow

Make sure your master is up to date with Kelly’s master by running git pull. If you completed the Git Setup correctly, this should pull from Kelly’s repository.

Create a new branch from your local master branch. Use the following naming conventions:

• git checkout -b feature/[ISSUE-NUMBER]-[UPI]-ISSUE-NAME
• git checkout -b fix/[ISSUE-NUMBER]-[UPI]-ISSUE-NAME

Make some changes to your branch using git commit and git push. In order to minimise merge conflicts, rebase often with git pull --rebase. This will keep the code in your local repo up to date with what is in Kelly’s repo (our master repo).

Once all your changes are ready, create a pull request. Pull requests should have the following naming convention: [*Issue Number*] Issue Title.

Notify somebody on the team that you have created a pull request (on slack, or in person). The reviewer should pull your branch and test that it works, before approving the pull request. If the reviewer has any problems, they should use GitHub's inline comments and request for changes. If you followed the setup above, use the following command to checkout the pull request branch locally: git fetch origin pull/PULL_REQUEST_NUMBER/head:BRANCH_NAME

Once the pull request is ready to merge, select “Merge and squash commits”.