Github

The main flow I was using yesterday:

1. From develop, git checkout -b <new branch name>
2. Work on branch, make code changes.
3. git push origin <new branch name> - When done, push up to GitHub on your own branch.
   • This will save your work in case there are any issues in the next steps.
4. When ready to open the pull req, git pull origin develop to get your feature branch up to date with development, resolve merge issues.

• This will allow you to sort out your branch with development and resolve issues locally.

5. git push - pushes your work to github

• this will again push to your own branch

6. In github, Open a new pull request (between your branch and development), & accept pull request. It should merge because you will have resolved any conflicts in step 4

note: The push to GH in step 3 is not strictly necessary, but I've put it in just in case the next steps go wrong so you at least have a backup of your work!