Git Flow

As explained in Infrastructure as Code, Patterns and Practices: With examples in Python and Terraform

Git Flow is a branching workflow that organizes software development around dedicated branches for features, releases, and fixes.

Git Flow, also called feature branching, isolates each change in its own branch and merges it into the main configuration after testing. section 7.2.1

Apply the workflow as an operational sequence:

• Clone the configuration, create a ticket-named branch, commit the change, and push the branch for review. section 7.2.1
• Fetch and merge main into longer-lived branches so teammates can test against current changes and resolve conflicts early. section 7.2.1
• Merge approved changes into main and deploy them while other feature branches continue independently. section 7.2.1

Firewall configuration

A TICKET-002 branch changes firewall rules while TICKET-005 updates a license. After TICKET-002 reaches main, TICKET-005 merges main, tests the combined configuration, and returns its branch for review. section 7.2.1

Figure 7.11 When you use feature-based development, you isolate your changes to your branch and reconcile conflicts with the main configuration.

Shows how separate branches isolate changes and reconcile conflicts with main. section 7.2.1

How Infrastructure as Code, Patterns and Practices: With examples in Python and Terraform covers it

How deep it goes

Demonstrates cloning, branching, committing, pushing, synchronizing, merging, testing, and conflict reconciliation.

Examples

Uses firewall-rule and license-update branches, ticket-based names, Git commands, diffs, and merge output.

What it assumes

Assumes familiarity with configuration changes and teammates while demonstrating the required Git operations directly.

What you can do after

Apply it via Git to isolate changes, synchronize branches, submit reviews, resolve conflicts, and merge tested work.

How it connects

Connects feature branching with main integration, testing, code review, conflict resolution, and deployment.

liveBookmanning.com

Read Infrastructure as Code, Patterns and Practices: With examples in Python and Terraform on liveBook Get the book at manning.com

Also explained in

• 

  liveBookmanning.com
  Think Like a CTOA Git branching model with separate master and develop branches and feature branches merged into develop before release.
• 

  liveBookmanning.com
  Lead Developer Career GuideA software development methodology that organizes work in Git through designated branches and branch-based integration practices.

Compare how 3 books explain Git Flow →

Related concepts

• gituses · Git is a distributed version-control system that records changes to files and supports managing project history and collaboration across repositories.
• branchuses · A branch is an independently evolving line of development in a version-control repository, typically represented by a reference to a sequence of changes or commits.
• versioning patternkind of · A prescribed arrangement of branches, integrations, releases, and related version-control practices.
• deployment pipelineuses · A sequence of automated or manual stages that builds, tests or validates, packages, and delivers software or models toward deployment.
• GitHub flowalternative to · GitHub Flow is a lightweight Git branching workflow in which changes are developed on branches, reviewed, and merged into a main branch.
• feature-based developmentkind of · Feature-based development is a software and infrastructure workflow that isolates changes on separate branches before review and merging.

This explainer was generated by Manning's knowledge graph from the text of Infrastructure as Code, Patterns and Practices: With examples in Python and Terraform. The section links point to the parts of the book it draws on.