Branch Keeps Bugging

[curteckstein]

Context
Well for the 3rd time now I have gotten the error that I cannot merge because I have underaged files and conflicts must be resolved

Problem or idea
I cannot resolve the issues because I don't know what the issues are and all the work in my branch is deleted

Solution or next step
Am I not doing something right when I update does anyone else have this problem?

[Regulator13]

Curt! That's rough. I'm not sure exactly what's going on. I think it'd be easiest to walk you through a change and merge on Discord. It's possible that @Phabbits or I am making edits while you're making changes, and they're incompatible so you can't merge, but even then you should be able to resolve the conflicts. If you can send a screenshot on here of your error that might help.

[curteckstein]

Next times it happens I will take a photo of the error and put it on here. As for now, when I try to open squared on my computer if I am in Curt2 I can open but if I am in Curt gml will not open it and also the edits done in Curt are now all gone. Ive been trying to follow the steps provided in the wiki you made but I must not be doing something right or not uploading the new material correct