Scrum Team Git Workflow

Update my local master
git pull origin master

Create a branch for the story and check it out
git checkout -b storyName

(work, work, commit, commit)

Switch to the master branch
git checkout master

Pull again to fetch and merge any changes
git pull origin master

Merge master into my branch
git checkout storyName
git merge master

Check everything one last time and fix any conflicts

Merge branch into master
git checkout master
git merge storyName

Push the changes upstream
git push origin master

Delete the branch from remote
git push origin --delete storyName

Delete the branch locally using -D instead of -d because it forces a delete
git branch -D storyName

Sorry, Comments are Closed.

You'll have to take it up with the author...