Git Flow

2024-10-22 git

One of my topics today was git workflows.
I read something about tig flow and the github flow.

In the past I always worl with a develop and a master brunch.
After I read about github flow, i wonddering why i always use develop branches:-)

For my customers workflow, i decide to use github flow with release branches.
With release brunches it is posible to ship single features from develop branch to the release branch,
without the need to create a new release.
I know that this is a little bit dirty, but the customer have little features sometimes, wich he wants to have on the production system without a new release of all other features they are already developed and merged. So i can cherrypick this comments to the actual release.

Feature  x__x               x     x
        /   \              /\    /\
Master x-----x----------x----x-----x---
                \    \ /      \       \
Hotfix           \    x        \       \
                  \    \        \       \
Release            x----x--------x       x

helpful git commands

pick a single commit from a other branch and execute them on the current branch
git cherrypick [commit-id]

set branch poiter to a specific commit.
git branch -f <branchname> <commit-id>

Links

Links for CI/CD

❰ back