Even the most experienced development team cannot avoid releasing a product which includes some defects. Usually, bugs are found while the team is already working on the next features to be released. In case the project anomalies review board decides that some defects shall be fixed before the next major release, the team has to implement the fixes starting from the previous frozen baseline. Then these changes must be moved to the current development stream where many conflicts can happen due to architecture modifications.
In this Open Space I would like to discuss how SW Configuration Management can support this process minimizing the effort of resolving merge conflicts.