Jump to content

A common ancestor could not be found


Erich
 Share

Recommended Posts

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.

image.png.cbc92a37bc67bd6e95d6895f17c2fe9c.png

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:

image.png.5c4e90bb7861e0227db55bf6167904b8.png

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

  • 2 weeks later...

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

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

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...