Skip to content

Git Workflow

The following branch name convention is used in this project

  • Those branches will be used for release and integration management, and will not be directly editable
    • master : History of tagged production ready releases
    • develop : Integration of newly developed features and bugfixes
    • release/ : Preparation of release packages. Starts from develop, merged in develop and * master
  • For the following Branches, use the JIRA integrated branch creation tool to start the branch.
    • feature/ : Used for development of new features. Starts from develop, merged in * develop
    • bugfix/ : Development of bugfixes. Starts from develop, merged in develop
    • hotfix/ : Development of time-critical bugfixes. Usually starts from master, merged in develop and master

If your current feature/bugfix branch is not on the latest develop, the (strongly) suggested way of updating is rebasing your local branch (either with rebase --interactive, or with a GUI tool), then push --force-with-lease ( --force-with-lease is (a lot) safer than --force) to update the distant matching branch.