7
votes
Accepted
How do you manage development-only files in your source control?
Solve the issue at deployment time.
As in, your production branch has all the dev configs and such. When you have a tool building and deploying your code, that re-configures your application to run ...
- 444
7
votes
Accepted
VSTS Scrum - What is the difference between Work Items vs Backlogs
(1) What is the difference between "work items" and "backlogs"
A work item is the generic term for an entry that describes and tracks activity, such as a product backlog item, a task, a bug, or a test....
- 913
6
votes
Release strategy for multiple Git feature branches being tested simultaneously
Test features separately and in order, that's really the best way to do it. Usually whichever one is done first gets tested first, but business needs could change that priority. When FeatureA is ...
- 5,586
5
votes
TDD how to avoid test duplication across team
In my experience doing development in this way, there are a few places this should get caught:
1) It should get caught in planning or daily scrum. Some sort of conversation like "I'm going to be ...
- 2,039
5
votes
Accepted
How to prevent overwriting changes in TFS version control by another team member
There are two techniques that work together to avoid this type of scenario from occurring:
Step 1: write a failing test before fixing the bug
When the bug has been found, the first thing to do is to ...
- 39.6k
5
votes
Accepted
TFS Branch (Lifetime) management
Instead of branching, create a label for each release.
Code can be pulled from source control using a label or you can use the label as a basis for a branch if you need to hotfix a release before the ...
- 4,850
5
votes
Accepted
Release strategy for multiple Git feature branches being tested simultaneously
Ahh. Congratulations! You’ve destroyed one bottleneck and discovered the next one! Now it’s time to look at actually continuously integrating your code. As you’ve found out, it’s hard to continuously ...
- 9,021
4
votes
Accepted
Does TFS have the capacity equivalent of branching/forking in Git?
Branches exist in both TFVC and Git, but they work fundamentally different.
A branch in TFVC is basically a fancy folder that you can check in to. Creating a new branch in TFVC is a copy-and-paste ...
- 46.1k
4
votes
Accepted
Standard approach for tracking half-done features in Azure DevOps
Within Scrum (and to my knowledge within SAFe as well) there is no such thing as a partially completed feature. All features are either on the backlog, being worked on or completely done. And the team ...
4
votes
Accepted
How to run machine-specific tests during DevOps remote build
Its best to design your program so that it is able to run after it's built.
In this case you need a default path in app settings, pretty easy, and a default ini file to be copied to that path.
...
- 84.4k
3
votes
TDD how to avoid test duplication across team
In the case of calls to the audit service, I would spin them off into their own stories:
As a user I want to be prompted to enter my smartcard PIN so that I can login
As an auditor I want to know when ...
- 46.1k
3
votes
Accepted
How to version control common libraries?
One simple approach is to treat CommonLib* as external dependencies - generate their deployables, store them in a separate repository, and copy them as needed into the deployables of Project*. That ...
- 11.6k
2
votes
Accepted
Why would you have different TFS environments?
A TFS collection provides logical and physical separation of a group of team projects, which can be important and useful in areas such as:
controlling/limiting access to sensitive code/data
creating ...
- 913
2
votes
Accepted
Handling Multi-Version Software Release?
With the assistance of a colleague I resolved this issue by using two projects which referenced the same classes but utilized different references.
First, I removed the project from the solution. I ...
- 159
2
votes
TFS to Git - repository set up
If I understand you correctly, your current process means that prior to a release, the Main branch will have check-ins for Feature A, Feature B and Bug Fix C. When planning a release, you will merge ...
- 137
2
votes
Release branches and trunk versioning
There are two major strategies that address both your problems.
1. Trunk has a "fixed" version number
You could choose to give the Trunk a version number 0.0.0.X, where only the X ever ...
2
votes
Accepted
Release branches and trunk versioning
Thanks to other answerers we finally agreed on the versioning system.
The idea is to start test version with release number (e.g. 1.1.0.1 means "test version for 1.1.0 release") and remove Test when ...
- 149
2
votes
How to prevent overwriting changes in TFS version control by another team member
I wholeheartedly second David Arno's suggestions about failing tests and code reviews. Also, there are often ways to write the code to make it less susceptible to that kind of error in the future.
...
- 149k
2
votes
Accepted
What are the risks of having a release branch?
...often there are untested changes waiting in the test branch which delays delivery of hot fixes for critical bugs in production.
Is there a method that allows for easy hot fixes and not introduce ...
- 20.5k
2
votes
What are the risks of having a release branch?
In an environment like yours, with your branching strategy, production hotfixes should occur on hotfix branches off the release branch. Once tested and approved, those changes should be merged back ...
- 331
1
vote
What are branching strategy pros and cons for 2 main types
I have 2 suggestion
Repository
I would prefer to split the projects in multiple repository. All related items in one repository and shared/common projects in one repository. It is easy to maintain in ...
- 11
1
vote
What are the risks of having a release branch?
The root cause of your problems is the use of feature branches (some people, myself included, consider them "evil"). Merging them together to obtain your single release branch is your bottleneck: ...
- 887
1
vote
At what Work Item level does the Product Owner prioritize in TFS?
This question transcends TFS, or any other development tool like Rational Team Concernt (IBM) or JIRA (Atlassian) just to name a few.
The Product Owner is the "Big Picture" person and should be ...
- 46.1k
1
vote
Accepted
TFS/VS Branching strategy with separate Web API's
When running locally point your api endpoints at the dev environment. Don't run local copies of all the apis and don't have more than one executable in a solution.
Also, don't have a branch per ...
- 84.4k
1
vote
Release branches and trunk versioning
Zero + Concat for non-release branches
I always begin non-release branches like Trunk with 0 and only try to keep it generally around the next release number by concatenating the release major and ...
- 194
1
vote
Release branches and trunk versioning
The two solutions that I came up with for this:
As per Bart van Ingen Schenau's "Release branch continues where Trunk ended" suggestion - basically the same as what you're doing at the moment, but you ...
- 3,231
1
vote
Release branches and trunk versioning
Lets say your trunk is at 1.3.0.3. Now you create a release branch for the "1.3" line, which means that branch starts with that number, 1.3.0.3. Simultanously, you set your trunk to 1.4.
Your ...
- 220k
1
vote
TFS Branch (Lifetime) management
Do you really need to have more than one Release branch? If you dont have multiple active release versions in production than just use one Release branch.
Merge the changes that are ready into it ...
- 194
1
vote
Combining GitHub and TFS / Visual Studio Team Services
Another option would be the successor to TFS, now known as Azure DevOps. This solution is essentially the same TFS that you have grown to know and "love", while adding the option to use ...
1
vote
Managing release configurations when using TFS Build
I think you're on the right track.
Is my belief that it is preferable not to rebuild for each environment reasonable?
You are correct. You should build once and deploy the same artifacts to each ...
- 3,163
Only top scored, non community-wiki answers of a minimum length are eligible