I am not a developer myself so please bear with me. We are providing solutions for various customers and it is common to have a situation like this:
- Our customer has a version 1.1, and wants us to provide maintenance and support for this version
- At the same time, they request us to develop another version (let's say 1.2) also with new features, that will get piloted in field (so both versions will be in production at the same time).
How can this mainline development work, there isn't just one mainline and for example fixes done on 1.1 (in support) need to be also merged into 1.2. but not the other way around with features.
The reason I ask is that our upper management heard that agile, CI, CD etc. is the thing and that we must do it.