Home

Git Flow:

1. Clone the repo
2. Checkout the development branch
3. Create a new branch with naming format: task-"your name"
4. Make your change
5. Commit your change with proper message*
6. Update the development branch
7. Merge your branch with development branch LOCALLY
8. Check for conflict and resolve (resolve process)
9. Push your change to your own branch
10. Create your pull request on development branch (you can use your commit message) via GitHub
11. You should not get a conflict if you have done step 6 to 8 correctly
12. Merge pull request (make sure there is no conflicts before doing this)
13. Delete your own branch