Branching in TFVC uses path-based branches that create a folder structure. When you create a branch, you define a source, usually the main folder, and a target. Then files from the main folder are copied into your branch. As developers work, they are encouraged to forward integrate (FI).
In Source Control Explorer, right-click the folder or file that you want to branch, point to Branching and Merging, and then click Branch. The Branch dialog box appears. In the Target box, modify the location and name for the new branch. You can also click Browse to specify a target.
In this articleMerging allows you to copy code from one branch to another, or to synchronize changes between two branches. You can only merge branches if you use TFS as your version control system.
Branching always seems to be a complicated thing to do. Not technically but yeah there are some real decisions/planning that goes in to come up with an appropriate branching strategy.
I know of this TFS Branching Guide
Any other resource or guideline which you recommend or use for branching and merge.
Sharing your experience in this area is really appreciated.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With