Merged in Git_Workflow.rst

Seems like that file was based on this one, but this one has had more recent activity.