Hi, please help me, I want to load the scene that I was working on, but there is this error, and I can't load it. I wind some help on the internet. It said you need to open the tscn file in notepad and find the mistake here, but I can't find it. Sorry for my English I'm from the Czech Republic, but I am using Grammarly, so It should be readable. Thank you for answering 😁
#Can't load scene pars error.
11 messages · Page 1 of 1 (latest)
Have you opened the tscn file in a text editor? Can you show the lines around line number 142?
Here it is
"Updated upstream" and "Stashed changes" sound like added content by the git stash command
it's an unresolved merge conflict
Aaaa, understand. Can I fix it?
yes, look up git conflict resolution
basically you need to get rid of the conflict markers in the file
and keep the lines that should be there