Resolve Conflicts

#1

Why might I be seeing this dialog box? I’ve never seen it before.

image

Edit: I selected “Use Ours” and the PNG file is now corrupted.

0 Likes

#2

Does anyone pushed changes to your repo before you did that? When last time you tried to push changes everything went ok? Were there Internet connection during that time?
It can be shown when there are some differences between your local files (local repository) and the repo in the cloud (remote repo)

0 Likes

#3

I’m the only one with access to the project so it should be just me. Internet has been working far as I know.
I did update Defold earlier on so it might be something to do with that.

0 Likes

#4

Not sure what is going on there. Do you have an external git tool as well that you could try instead?

0 Likes

Project appears to be damaged