ShadowMage Posted June 11, 2012 Share Posted June 11, 2012 I think I may have hosed my repository but I'm not sure. Hopefully somebody can help, because I'll be losing a fair bit of data if I have to restore my repo from backup. It's a really long story, but here's the gist of it: I wasn't happy with how I was handling the merging, tagging, and exporting of my live and development versions. In my repo, the trunk was basically my development version, which meant that when minor bugs occurred in my live version, I couldn't use the repo to make changes. It got messy fast. So I restructured the trunk to have two branches: live and development. Here's the problem. I have several branches (created from the original trunk) and now I've completed one of them (let's call it Comments) and need to merge it with my development branch of the trunk. When I tried to switch to the development trunk branch to reintegrate the Comments branch, I got this error: 'file:///C:/.../SkyPrice/trunk/Beta' shares no common ancestry with 'K:/.../SkyPrice_WIP' Is there another way to merge the two or am I stuck? As I said, if I have to restore my repo I'll lose a significant amount of data (though I could find a workaround) because I've made a lot of changes to the branches I have since change the repo structure. Help please? Thanks. 2 Link to comment Share on other sites More sharing options...
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!Register a new account
Already have an account? Sign in here.Sign In Now