Skip to content
Tomas Farago edited this page Mar 29, 2016 · 4 revisions

Development workflow

Bugfix backporting

Suppose, a bug was reported that affects either master or an older branch. The bug should be fixed and tested on master. Once the bug is fixed, the commit(s) that fixed the bug must be backported to the latest stable release. This should be done by cherry-picking the relevant commits from master with the -x option:

$ git checkout 0.4
$ git cherry-pick -x 2bf00d
$ git push

Open question

  • Which branches should receive the bug fix? Only the latest stable release?
  • For how long should a bugfix release be hold back?

Competition

  • NICOS developed at TUM and used for FRMII
  • Sardana developed at ALBA
Clone this wiki locally