What is the correct way to store future changes in TFS? (Can't be implemented until a certain day)
c#, tfs
Solution
You should create a separate (we call it feature) branch. Make your changes and continually merge from Main to this feature branch so you don't have a huge merge problem when you're ready to merge back to Main. When you're ready to merge and implement the changes, merge from your feature branch to Main, then eventually to a release branch.
Problem
I work for a company that is regulated by a government entity. They specify certain specs yearly, and often make changes that require much of the code-base to be changed. That being said, we like to make changes beforehand to avoid the stress and rush of last minute implementation. What is the best way to store code in a bucket with all other related code so that we can also still make feature and bug fixes while waiting on the deadline? Would creating a private branch off the main repository work? – carlosfigueira I'm not sure. It is a team effort so does private allow them to work as well? Do we all create individual private branches or one large branch? My biggest concern is trying to merge all these changes with the latest bugfixes and features. It seems like it would be a nightmare. If private branches help this, I'll look into them.