Reputation: 31
We are in the process of implementing continuous integration in our organisation, and one of the questions that arose is how to fix a bug in the live build.
Option 1 seems to be what is advocated by continuous integration, but seems high risk. Option 2 is what has been done historically, and is low risk.
Upvotes: 3
Views: 129
Reputation: 37576
It depends ! If you think your bugfix is envolving deep changes then you should create a branch on which you you work, otherwise (and normaly) bugfixes are not that risky, the assumption is that the one who is fixing the bug knows what is he doing, so it can be done on the head.
PS. making a branch will force you to merge later which can be really annoying if the head gets a lot of changes in while you are implementing the bugfix.
Upvotes: 1