Quantcast
Channel: Mendix Forum Questions
Viewing all articles
Browse latest Browse all 83234

Mainline is unable to commit or merge changes

$
0
0

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:


Viewing all articles
Browse latest Browse all 83234

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>