Page Comparison

Overview

We use the common git workflow, which means we have two major branches:

...

Bugfixes are splitted into hot- and bugfixes. See bellow sectionbelow section.

For informations about the Versioning Schema click here.

see: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

Bugfix vs Hotfix

Bugfix: not so important, will be merged to next released in normal schedule cycle of the software into dev (and then from dev to master)

Hotfix: important bug, branch from master - merge into master & dev, will be released soon / faster. Important security fixes, ...

Howto add a new branch

Anchor
Howto_add_branch Howto_add_branch

...

Example for a new feature branch

# move to dev 
git pullcheckout all branchesdev
git pull

# git add local branch auto following/tracking remote branch
git checkout --trackb originfeature/feature/configyour-cool-feature-branch

# your work and commits
git add -p
git commit -m "Commit Message XYZ"

# git push auto to remote branch -> 
# see Git config global push.default = simple
# NOTE: if not working – just follow git instructions
git push

Useful GIT stuff

Push style

# push all branch names on local git to same names on remote git 
git config --global push.default simple

Enable server certificate on client

Trying to clone/fetch whatever a repo the git server ends with the error message

...