We're a team of 3 developers and we use TFS for our source control.
1. This is how the previous developer moved code to QA and Prod:
a. He published code locally
b. He used BeyondCompare to compare the files to the folder on the QA or Prod server
c. He copied the Bin folder or whatever files changed to QA or Prod servers
We're looking into Build Servers. Someone mentioned Jenkins or
1. How does Jenkins or TeamCity work with TFS? We can still use TFS, correct?
2. We have a Dev server, QA server and Prod. Suppose I make a change to my code. Does this change automatically get uploaded to the Dev server when I check into TFS?
3. What if all 3 of us make changes to the project and check in the code. How does the merge happen? do we still need to merge in TFS, check in and then Jenkins/TeamCity takes over of moving code?
4. This is how our TFS branches are setup --> we each have our own branch (3 branches). We check in to our own branch. Then we merge into our DEV branch. We eventually use the DEV branch to publish code for Production.
a. If we use a Build Server, how can we ensure the DEV branch is not messed up and has clean code for Prod?
b. Do we need a "pre-DEV" branch ---> Jenkins/TeamCity builds to "Pre-DEV" and then I'll manaully merge into "DEV" branch and have a solid code base for Prod?
I need to wrap my head around this and I don't quite understand how a Build Server will work with TFS and our current process.