tsvc Posted July 8, 2016 Report Share Posted July 8, 2016 Hi, we are using Xlink for a shared code repository for a few days now in 2 repositories. Since then we can't use "merge-to" to merge from the active branch in our main branch. We are getting an "Merge-to can't be run because there are conflicts". But there isn't any conflict at all. So we have to switch from the active branch to the main branch, start the merge with "merge from this changeset", perform the merge and then switch back. This workflow takes to much time for us, especially if our artist checked in a huge amount of big files. Is this a configuration problem? Greetings Tim Link to comment Share on other sites More sharing options...
manu Posted July 20, 2016 Report Share Posted July 20, 2016 Hi Tim, I'm sorry but if the repository is having xlinks the merge-to operation is not possible. It's a restriction. Sorry for the inconveniences. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.