I must have messed something up with Tortoise or merging. When I open/download the mainline, it only gives me the Team options to download/upload to teamserver or manage branch lines. Mainline shows up as a local copy. Uploading to the teamsever returns the error "Teamserver is not emtpy". Downloading results in the same as above, a local copy with only the download/upload and manage options available under Team. In the graph below, the furthest branch has been brought to the first branch. Due to the issue, I can't bring the first branch to mainline. How do I get the mainline back to normal? Tortoise graph:
I guess I'll just ignore t he mainline and use the first branch I made as the mainline instead.
This happened to me once, because we changed the name of the application. I renamed the mpr file to the new name and I couldn't upload to the teamserver anymore. Is this the case here?