The workflow is as follows:

1. Pick an Issue

2. Update (or clone) the local repo

3. Create new local issue branch

4. Hack away

5. Commit and push to a new server branch

6. Create pull request

7. (Solve feedback)

8. Delete local branch

If you don’t have git and/or hub, run in Powershell with admin rights:

then

1. Clone if this is the first time modifying the codebase.

   git clone https://github.com/CIMB-TEC/WebSite.git
   cd Website
   git fetch origin
   git checkout -b dev origin/dev

2. Create new feature branch

   git checkout -b {your-name}/{place-where-issues-will-be-solved}

3. Begin making changes. Once finished, add, commit and push changes.

   ❗	The commit message (the string between the quotes) should follow this format: {Changes} GH-{ISSUENUMBER}

   If the commit solves the issue, add "Solve" before the GH-Issue

   git add *
   git commit -m '{COMMIT MESSAGE}'

4. Push & create a pull request with necessary info

   ℹ️	You can get the branch name using git branch

   git push --set-upstream origin <branch name>
   hub pull-request -m "Solves #{issue-number} {and Solves {issue-number} and Solves...}" -m "{Description of changes}" -b CIMB-TEC:dev

   At this point, you should wait for feedback. If there are changes to make, add, commit and push again but do not create another PR.

5. If your changes got accepted and merged into dev, delete your feature branch from local so next time you work you start clean.

   git checkout dev
   git branch -d <branch name>

6. When you are ready to tackle another issue, be sure to get the latest changes before you create a new feature branch from dev.

   git pull