Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

I have a question regarding source control in a general sense and specific to TFS.

Let's say you have a three-tier system (Development branches, QA main trunk and Production branch).

At a certain point, the changes from the dev branches are merged to the QA branch and the QA branch is tested. After the initial test, "feature A" is broken and needs to be fixed or removed, how should a feature be updated or removed from the QA branch? Should it be edited directly? or should the developer checks in the changes to dev and let it propagate up to QA again?

Any thoughts on this (in general)? Also if this is done in TFS is there any tools that can help out with this situation?

thanks!!

share|improve this question

1 Answer 1

up vote 1 down vote accepted

how should a feature be updated or removed from the QA branch? Should it be edited directly?

No, that would be a bad idea (except maybe in case of great hurry, when the same changes are introduced on the dev branch afterwards ASAP.)

or should the developer checks in the changes to dev and let it propagate up to QA again?

That would be the proper way. The branches should be kept in sync as much as possible, i.e. the QA branch should always contain an "older" version of the dev branch.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.