carpediemevive Posted August 9, 2012 Report Share Posted August 9, 2012 I have a significantly messed up (by the users not Plastic), that I'm trying to exert some control over. However when I attempted to merge these two branches together I get an error: The revision 35935 is loaded twice on cs:197 tree on paths '/(name_conflict)_jordans-export' and '/jordans-export' I found changeset 197 and I can't browse the changeset at all, I get the same error. Changeset 197 is the common ancestor for this merge, hence why I found it on the merge. Anyone have any suggestions? I need to get this resolved ASAP. Link to comment Share on other sites More sharing options...
carpediemevive Posted August 9, 2012 Author Report Share Posted August 9, 2012 It's less of a big deal now, but I'm still unable to browse that changeset. Any help would be appreciated. Link to comment Share on other sites More sharing options...
manu Posted August 10, 2012 Report Share Posted August 10, 2012 Is the merge bypassed? Do you want to get connected through GoToMeeting? Link to comment Share on other sites More sharing options...
carpediemevive Posted August 10, 2012 Author Report Share Posted August 10, 2012 It's not as critical an issue anymore because I've discovered I don't have to merge the branches that I thought I was going to have to. It just means for now I won't be able to merge theses branches or view a couple of changesets until it's resolved. I can absolutely get connected with you on a GoToMeeting if you have the time. I'm on EDT time currently and available all day today until 4 PM local time. Otherwise it can wait until next week. I'm generally very available. Link to comment Share on other sites More sharing options...
manu Posted August 10, 2012 Report Share Posted August 10, 2012 Ok, let's do it next Monday. Link to comment Share on other sites More sharing options...
carpediemevive Posted August 10, 2012 Author Report Share Posted August 10, 2012 Sounds good, I'm available all day. Link to comment Share on other sites More sharing options...
manu Posted August 13, 2012 Report Share Posted August 13, 2012 What about your 10:00 AM? (my 4:00PM)? Link to comment Share on other sites More sharing options...
carpediemevive Posted August 13, 2012 Author Report Share Posted August 13, 2012 That works for me. I'll wait for an e-mail or look here before. Link to comment Share on other sites More sharing options...
manu Posted August 13, 2012 Report Share Posted August 13, 2012 Cool, I'll email you in 1.5h aprox. Link to comment Share on other sites More sharing options...
carpediemevive Posted August 13, 2012 Author Report Share Posted August 13, 2012 Very big thank you today for helping me out so quickly, even though it turned out to be not an issue at all!! You guys rock. Link to comment Share on other sites More sharing options...
manu Posted August 14, 2012 Report Share Posted August 14, 2012 You are welcome! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.