I'm working for a manager who doesn't want to push back on the organization the need for a discipline when it comes to software releases. In other words, he wants the flexibility of the stakeholders being able to exclude any or several features at the last minute before we do a release to QA or production.
We use Bitbucket (Git), and we have a codebase that doesn't allow us to toggle whether a feature is enabled or not (for the most part) because the guts of the application is an expensive Content Management System that stores all content and entity relationships in a database. The manager wants feature branches, AND continuous integration, and doesn't want to hear anything about the merge conflict hell that this will put our small development team in since we don't have a dedicated release engineer. He doesn't code any more nor use the Git tools, but keeps running back to some document he found on the Bitbucket website that "proves" that his strategy is the right one.
How would you steer this? Or do I just let this guy carry out his plan and fall on his own sword?