TFS SourceControl Trunk Merge Branch

Question

I'm having branching issues in Visual Studio TFS. This may be due to the method in which I am developing, but if so, please let me know what is best for branching and I will modify our procedure.

About a month ago, I branched out a project so that I could start developing a new version of the web application, but did not want to be affected by my main changes when I tested and tried to get to the production level.

So, a couple of days ago we learned about several errors in the current version of the application, which works during the production process. I fixed these errors in the main branch, reinstalled the web application and checked the bug fixes in the main line of the application. And here is the problem. Now the main trunk has bug fixes, but there is no new version in my branch.

Here's my question: how do I make version comparisons or something like that to get bug fixes in a forked project?

I can do something unusual. This is due to a lack of knowledge about the life cycles of branching and development. Please let me know if there is a better method that you all practice in your stores.

Greetings

FROM

Answer 1

It looks like you are doing the right thing for me, you just need to merge your changes into your dev branch.

To merge the changes, you must be in Source Control Explorer. Right-click on the source branch (in your case, which is the main branch), and then select Merge. Then you will go to the merge wizard, where you can choose which branch you want to join (your development branch). Personally, I always select the "selected changesets" option on this page, since it gives you a list of change sets, and you can choose the beginning and end of the range of change sets that you want to make to your development branch.

Hope this helps.

Martin

Answer 2

You just need to merge these changes into the new version branch.

A good starting point is the branching and merging guide . Read it to find out how you can organize your branches.