Git-branch strategy

[rafmudaf]

Whether to commit directly to main or maintain a buffer branch called develop.

For bug fixes, with the develop branch we do this:

%%{
    init: {
        'logLevel': 'debug',
        'theme': 'default',
        'gitGraph': {
            'showCommitLabel': false
        }
    }
}%%
gitGraph
    commit
    commit tag: "v1.0"
    branch develop
	  commit
    checkout main
    commit tag: "v1.0.1"
	  checkout develop
    commit
	  checkout main
    commit tag: "v1.0.2"
    checkout main
    commit
    merge develop
    commit
    commit

Loading

If we're not using a develop branch, then we would do bug fixes like this:

%%{
    init: {
        'logLevel': 'debug',
        'theme': 'default',
        'gitGraph': {
            'showCommitLabel': false
        }
    }
}%%
gitGraph
    commit
    commit tag: "v1.0"
    branch bugfix1
    branch bugfix2
	  checkout main
	  commit
	  commit
    checkout bugfix1
    commit
    checkout main
    merge bugfix1 tag: "v1.0.1"
    checkout bugfix2
    commit
    checkout main
    merge bugfix2 tag: "v1.0.2"
    commit
    commit

Loading