[SOLVED] Unable to resolve conflict during merge

Help & Support
1

Hi there, I have a problem merging.

I get these conflicts:

image
image1166×704 39.5 KB

They are not unexpected. I would like to just choose USE ALL FROM THIS BRANCH, but neither of the two buttons can resolve the top conflict. They do nothing, no error message. All other conflicts can be resolved, but not the top one. Besides, I don’t see the change that causes the conflict, so maybe that’s the problem, it’s falsely reported as a conflict and can’t get past it.

This comes after a prior bug I reported elsewhere, that importing an fbx wiped my anim component references. The scene is https://playcanvas.com/editor/scene/1143050 (private)

2

Hi,

Can you open the browser’s developer console and send us a screenshot of any errors you are getting there?

3

This is full output from console, the error occurred during browser refresh, not as any part of merging.

image
image1007×1056 57.9 KB

4

Hmm. Not 100% sure that error is related.

When you attempt the merge and press either button, does it fire an error in the console?

Would you be able to share the branch names so that we can attempt the merge ourselves (either via email to private message) please?

5

No, that error message in the console is unrelated to the merging problem. There are no error messages during merging. There are only two branches and neither can merge into the other. I attempted to merge into “master”.

6

Can you add vaios to your project so I can have a look?

7

You should be added now

8

Can you add zpaul also?

9

Done

10

@vaios has deployed a fix for the merge issue :slight_smile: Please try again now

1 Like
11

Great, I’ll try that, but appears zachary has a merge in progress…

12

Cancel zachary’s merge if you can.

13

Thanks, it works now!

1 Like