The Data Doodle

A blog about visualizing, analyzing, and managing data

Git Workflow

How does code get from a developer’s machine through all the steps of testing and integration and deployment? A well-defined process flow is essential. Here are a couple examples of flows I designed and implemented.

A high-level overview of a workflow I used for Enterprise Risk Manager. At the time, this was absolutely revolutionary to me coming from a .Net background and previously being constrained to TFS source control.

Git Flow is now part of the github/bitbucket experience.

Standardized git practices are great! Git Flow doesn’t totally eliminate merge conflicts, but it helps alot! Each feature branch gets merged into the develop branch. After any conflicts are resolved, develop is then merged into master.
Git Flow shown in Sourcetree