Cohort4.2/JhipsterGroupProject-Server - Git Zipcoder

Part 1, Creating The Team Branch (after forking)

cd ~/dev
git clone https://git.zipcode.rocks/MyRepositoryHost/NameOfProject
cd NameOfProject
git checkout -b teambranch
git add .
git commit -m 'first commit'
git push -u origin teambranch

Part 2, Creating a Feature Branch

git fetch origin
git checkout teambranch
git checkout -b featurebranch

Part 3, Synching a Feature Branch With Team Branch

git fetch origin
git checkout featurebranch
git pull origin teambranch
git add .
git commit -m 'feature branch synched with team branch'
git push -u featurebranch

Part 4, Merging a Feature Branch into Team Branch

git fetch origin
git checkout teambranch
git merge featurebranch
git add .
git commit -m 'merged featurebranch into teambranch'
git push -u origin teambranch