Workflow

When working with a team on a Git managed project, it’s important to make sure the team is all in agreement on how the flow of changes will be applied. A Git Workflow is a recipe or recommendation for how to use Git to accomplish work in a consistent and productive manner. Git workflows encourage users to leverage Git effectively and consistently.

Feature Branch Model

• Create branch for any feature, fix, issue. Remember to follow <type>/<platform>/<scope> naming convention.
• Try to preserve good quality of history for even the smallest branches.
• Use pull requests to submit final changes.

Rebase Merging

• Don't directly use merge command, merge commits are not allowed.
• Rebase and then resolve conflicts in your branch, changing master history is not allowed.