git-collaboration-strategy.md 897B

Part 1, Creating The Team Branch (after forking)

  1. cd ~/dev
  2. git clone https://git.zipcode.rocks/MyRepositoryHost/NameOfProject
  3. cd NameOfProject
  4. git checkout -b teambranch
  5. git add .
  6. git commit -m 'first commit'
  7. git push -u origin teambranch

Part 2, Creating a Feature Branch

  1. git fetch origin
  2. git checkout teambranch
  3. git checkout -b featurebranch

Part 3, Synching a Feature Branch With Team Branch

  1. git fetch origin
  2. git checkout featurebranch
  3. git pull origin teambranch
  4. git add .
  5. git commit -m 'feature branch synched with team branch'
  6. git push -u featurebranch

Part 4, Merging a Feature Branch into Team Branch

  1. git fetch origin
  2. git checkout teambranch
  3. git merge featurebranch
  4. git add .
  5. git commit -m 'merged featurebranch into teambranch'
  6. git push -u origin teambranch