Description
I committed a large number of files in the UI, and the engine crashed. No matter how many times I restarted it, it would just crash. After digging through multiple similar errors about null pointer problems, I decided to just delete the addons folder and .git folder, and try again.
I did that, connected to my remote, and pulled, then the engine crashed again. I tried to open it back up, but it said my project was missing, so I started investigating. No matter how many times I tried to import or fix it, it kept showing up as a missing project.
Eventually I found that, in my project.godot file, I had some 'git leftovers' that seemed to be the cause of the issue. I opened the file in Notepad++ and saw this:
[layer_names]
2d_physics/layer_1="Terrain"
2d_physics/layer_2="Player"
2d_physics/layer_3="Enemy"
<<<<<<< HEAD
2d_physics/layer_4="EnemyCollision"
2d_physics/layer_5="PlayerPickup"
=======
>>>>>>> 4b4b00a2eeacbdcc94630ff9d3e3d72696e6215c
[rendering]
renderer/rendering_method="gl_compatibility"
renderer/rendering_method.mobile="gl_compatibility"
<<<<<<< HEAD
=======
2d/snap/snap_2d_transforms_to_pixel=true
2d/snap/snap_2d_vertices_to_pixel=true
>>>>>>> 4b4b00a2eeacbdcc94630ff9d3e3d72696e6215c
textures/canvas_textures/default_texture_filter=0
These were all settings I changed between the last commit, and this newest one, but these are in every single file I had changed. Each scene, resource, and script had 'ghosts' of the previous git action I was trying to make when the editor crashed, and on account of that, has Parse Errors in godot, leaving the entire thing unusable since my last commit.
Id love to find the source of what caused the initial crash, but at the very least, Id love to see it handle crashes better by gracefully closing files, and not completely breaking every node/scene that had changes in it due to the 'phantom git' merge problems being left behind in each text file