unity seems to have merge conflicts. Please open it in a text editor and fix the merge.

"The file Assets/Scenes/Main_Test_Level.unity seems to have merge conflicts. Please open it in a text editor and fix the merge."

Open your scene in text editor... what?!?

can some one tell me what I have to fix and where.

 

I have the same..."the file \...\...\SampleScene.unity' seems to have merge conflicts. Please open it in a text editor and fix the merge." All I did was change my external text editor, restart the unity client and I get this 5 times in the console. The scene loads with nothing in the Hierarchy.

 

Here is a pastebin of the YAML https://pastebin.com/raw/YdAZeYth

 

How to resolve the merge conflict via git. That is the problem

 

Please don't reply to 3-year-old posts with standard git questions.

If you change an asset in two branches (eg, you do it in your

master

branch and I do it in my

master

branch), that asset must be merged. This is orthogonal and unrelated to Unity.

Scenes and prefabs are difficult to merge and rivers of digital ink have been spilled over it. This requires caution on your part. The easiest is prevention. The second easiest is abandoning the merge, renaming one of the conflicting files, committing the rename, then re-merging so you can bring both up as separate scenes and resolve the issues within Unity.

Look up git merging for many more details. If you have a merge in progress you MUST abort it first.

 

Sorry, didn't know. thanks for the answer.

 

Hi, could you clarify why that's an issue, is that against forum rules? Thanks for answering their question, by the way, it's really helpful. Which kind of goes to show that they were right to ask it in the first place?

 

Yeah, that kurt dekker guy thinks he has the right to tell people what to do. Sheesh. And it's a shame, because he's an extremely smart and helpful dude when he wants to be.

 

I've seen him post / comment so many gems of knowledge here, real expert! Everyone can have a bad day, I guess...

 

You too necro-posted to a thread with even less of a purpose?

Remember, every one of my posts is optional. People ask how to fix something and I offer my guidance.

Not ever once do I even remotely think I have ANY right to tell anyone what to do.

You have hallucinated this reality all in your own brain.

Mods: please lock this horrible necro-magnet of a thread.