Workflow example for remote repository use of GIT

["Sean Kelley" <sean.v.kelley@gmail.com>]

I have been trying to set-up a workflow for developers in my group
using GIT. I came up with this simplified flow.  Do you all see any
problems with this approach?

Thanks,

Sean



Always work out of master

  git checkout master

Getting The Latest Upstream Code into master

  git pull origin master

Create a topic branch for your development work

  git checkout -b <new topic branch name>

Do your development in the topic branch

  edit/debug/test

Committing Changes

  git commit -a

Switch back to master

  git checkout master

Update the master branch from origin again

  git pull origin master

Now Merge your topic branch

  git pull . <topic branch to merge into current branch>

How do I push my changes to the original repository?

  git push origin master

--