Skip to content

Instantly share code, notes, and snippets.

@hiroki-uchida
Last active December 4, 2023 01:18
Show Gist options
  • Save hiroki-uchida/596db2fdeab28dd672c92c5505e06e88 to your computer and use it in GitHub Desktop.
Save hiroki-uchida/596db2fdeab28dd672c92c5505e06e88 to your computer and use it in GitHub Desktop.
mermaid.js Git-flow

git-flow on mermaid

reference: https://nvie.com/posts/a-successful-git-branching-model/

gitGraph TB:
    commit tag: "v1.2.3" type: REVERSE
    branch develop
    checkout develop
    commit

    branch feature/xxx
    checkout feature/xxx
    commit
    checkout develop
    merge feature/xxx

    commit

    branch feature/yyy
    checkout feature/yyy
    commit
    checkout develop
    merge feature/yyy

    commit

    branch feature/zzz
    checkout feature/zzz
    commit
    checkout develop
    merge feature/zzz

    commit

    branch release/v1.3.0
    checkout release/v1.3.0
    commit id: "version up commit etc."
    checkout main
    merge release/v1.3.0 tag: "v1.3.0" type: REVERSE
    checkout develop
    merge release/v1.3.0

    commit

    checkout main

    commit
    branch hotfix/v1.3.1
    checkout hotfix/v1.3.1
    commit
    checkout main
    merge hotfix/v1.3.1 tag: "v1.3.1" type: REVERSE
    checkout develop
    merge hotfix/v1.3.1
    commit
Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment