[Can't merge branch with two heads]

Edit4: [FIXED]

The format was wrong again. This one has done it. Leaving out the forward slash '/'

mount:56e62dd7-241f-41e9-8c6b-dd4ca4513e62#<Repo_Name>@<Server_IP_Or_Name>:8087 merged from: Merge <CSET_ID>

-----------------------------

 

Ah okay, so I just need to add the source head I want to merge. That's changeset 1122.
Tried it but still not working.

Here are the new errors I encountered:

mount:56e62dd7-241f-41e9-8c6b-dd4ca4513e62#/airogames_lifeofdelta@local merged from: Merge 1122

After that I tried changing to my cloud server and got this error:
 

mount:56e62dd7-241f-41e9-8c6b-dd4ca4513e62#/airogames_lifeofdelta@Airo_Games@cloud:8087 merged from: Merge 1122

Currently I'm look into finding the client.conf file.

Appreciate the help!

 

Edit: Found the file, adjusted to 30000ms, same error.

Edit2: Changing the port to 8787 fixes the timeout but throws the first error again about the repository not being found.

Edit3: Tried `cm lrep localhost:8084` to see if the repo exists and it does.

airogames_lifeofdelta@localhost:8084

Tried to replace airogames_lifeofdelta@local by this, didn't work either.

[Can't merge branch with two heads]

Hi Carlos,

thanks for your reply!

I can't seem to get it right. No matter what I add as <Repo_Name>@<Server_IP_Or_Name> I get the same error.
The repo name should be correct. I tried my local repositories server name with @local, with and without the port :8087.
I also tried the cloud repositories server name. Could it be a different port and if, where can I find it?

The only way I get a different error is removing the second hash before the <Repo_Name>.

After that the client crashes. Here is the last exert:

mount:56e62dd7-241f-41e9-8c6b-dd4ca4513e62#/airogames_lifeofdelta@local merged from: Merge 1134
mount:56e62dd7-241f-41e9-8c6b-dd4ca4513e62#/airogames_lifeofdelta@local merged from: Merge 1122
......

I also tried setting the guid of the commits instead of the changeset id.

[Can't merge branch with two heads]

Hello,

I'm having following issue:

I can't push my branch because it has two HEADs. So far so good. But I also can't merge/unify them because the merge destination already has all source changes. The reason being that I already merged the changes from one HEAD to my main branch and then back into the other HEAD. The screenshot shows it pretty well.

Now I don't know how to tackle that. Anyone got an idea? Appreciate all answers!