Erich Posted October 5, 2022 Report Share Posted October 5, 2022 Hi! I have a repo where the main working branch (/main/FPGA) is not "connected" to the main branch (/main). The reason for this is because some time ago one branch of a repo was synced to a new repo but after the sync the connection was missing. After the sync of course we continued working on the new repo. If I want to merge it "back" to the main branch I get the following error message: Other tasks like migration to git are not possible as well! Is there a solution to fix that problem? BR Erich Link to comment Share on other sites More sharing options...
calbzam Posted October 13, 2022 Report Share Posted October 13, 2022 Hi, I'm afraid you cannot run a merge if there is not a common ancestor between the branches you plan to merge. You will need to sync the missing branches/changesets in order to run the merge. Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
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 accountSign in
Already have an account? Sign in here.
Sign In Now