Search Unity

  1. Welcome to the Unity Forums! Please take the time to read our Code of Conduct to familiarize yourself with the forum rules and how to post constructively.
  2. Dismiss Notice

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

Discussion in 'Editor & General Support' started by Mr-Ruho, Nov 28, 2018.

Thread Status:
Not open for further replies.
  1. Mr-Ruho

    Mr-Ruho

    Joined:
    Mar 1, 2014
    Posts:
    1
    "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.
     
  2. JeffDUnity3D

    JeffDUnity3D

    Unity Technologies

    Joined:
    May 2, 2017
    Posts:
    14,446
    Where are you seeing that error, perhaps share a screenshot?
     
  3. umdio

    umdio

    Joined:
    Nov 21, 2018
    Posts:
    2
    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. Screenshot from 2019-02-05 16-06-22.png
     
  4. umdio

    umdio

    Joined:
    Nov 21, 2018
    Posts:
    2
  5. harryr

    harryr

    Unity Technologies

    Joined:
    Nov 14, 2017
    Posts:
    38
    This error occurs when you have git merge conflict markers in your YAML files (in this case a scene file).

    If you open up that scene file in a text editor and search for "<<<<<<< HEAD" you'll see them.

    To fix it you'll need to resolve the merge conflict via git and then your scene should load correctly.
     
  6. deniztkaymakci

    deniztkaymakci

    Joined:
    Mar 12, 2021
    Posts:
    3
    How to resolve the merge conflict via git. That is the problem:D
     
    Michael_Berna and PixelFireXY like this.
  7. Kurt-Dekker

    Kurt-Dekker

    Joined:
    Mar 16, 2013
    Posts:
    36,711
    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.
     
    Joe-Censored likes this.
  8. deniztkaymakci

    deniztkaymakci

    Joined:
    Mar 12, 2021
    Posts:
    3
    Sorry, didn't know. thanks for the answer.
     
    PixelFireXY likes this.
  9. spilat12

    spilat12

    Joined:
    Feb 10, 2015
    Posts:
    33
    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?
     
    elcuci, hen_unity, NIOS and 9 others like this.
  10. elcuci

    elcuci

    Joined:
    Jun 13, 2021
    Posts:
    17
    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.
     
  11. spilat12

    spilat12

    Joined:
    Feb 10, 2015
    Posts:
    33
    I've seen him post / comment so many gems of knowledge here, real expert! Everyone can have a bad day, I guess...
     
  12. Kurt-Dekker

    Kurt-Dekker

    Joined:
    Mar 16, 2013
    Posts:
    36,711
    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.
     
  13. MelvMay

    MelvMay

    Unity Technologies

    Joined:
    May 24, 2013
    Posts:
    10,507
    Kurt-Dekker likes this.
Thread Status:
Not open for further replies.