GIT Workflow Basics

  1. Simplest Centralized Workflow
     Not preferred

    1. One origin master, all members clone from the remote master
    2. All members work on the local master
    3. All members need to first pull the remote master, and then rebase to push to the master
    4. Members manage conflicts in the 3rd step case by case
  2. Feature Branch Workflow

    1. One origin master, all members clone for the remote master
    2. All members create a new branch to work on locally, if necessary, push only one branch for each member to the remote server
    3. All members must merge the new branch with master to push
    4. Members manage conflicts in the 3rd step case by case