How to merge Team Server and Main Line?

Hi all, Since starting my new app, I discovered that I have a Team Server and a Main line. How do I merge these two together into my Main Line Project? Thanks in advance
1 answers

Your team server is the location of your application, your Main Line is one of the branches you have. You can thus have a Main Line committed to your team server. And following the same logic you can download/update the Main Line from your Team Server.

Merging is something you do between two branches.