In practice I have two new features that are under change control and that I want to be able to track them as separate changes from the first change and until the features are deployed to production.
How do I handle the fact that they both need to make the same changes to one part of the code? If I let one of them carry the change but then decides later on to back out of that “Feature” then I will break the other feature that where depending on the same change.
I am curious to know of any good advice or best practices to use i CM when dealing with those type of scenarios.
We use MS TFS as version control and status accounting tool, but I am really interested in learning about best practice in general.