Victor Leung
Victor Leung
BlogFlower shop

Resolve merge conflict for Unity Game Engine

May 21, 2016

I’m working in a group of 4 teammates for a unity 3D game project on the weekends. It’s pretty fun, but we have encounter problems with version control. Using Git and Github, there are many merge conflicts that it’s not easy to resolve, not simply delete a section or forced push:

    <<<<<<< HEAD:main.scene
    Delete me

There are lots of unnecessary local meta files that are pushed to our repository. Here is the solution I got, which is not perfect, but it works:

Firstly, open the unity editor, go to

    Edit -> Project Settings ->Editor ->
    Select “**Visible Meta files**” in version control mode

Secondly, add the .gitinore file like this:


    # Autogenerated VS/MD solution and project files

    # Unity3D generated meta files

    # Unity3D Generated File On Crash Reports

    # Builds


Then commit the actual changes and run the following command:

    git rm -r — cached .
    git add .
    git commit -m “fixed untracked files”

Thirdly, Unity has a tool called UnityYAMLMergefor merging scene and prefab files. Enable this by creating a .gitconfig file with following:

    tool = unityyamlmerge

    [mergetool “unityyamlmerge”]
    trustExitCode = false
    cmd = /Applications/Unity/ merge -p “$BASE” “$REMOTE” “$LOCAL” “$MERGED”

Next time a teammate clone the project, he would probably just see an empty scene. But don’t panic, open the saved main.scene (hopefully you saved the scene and committed it), then the rest should work as expected. I wish Unity could have source control build in by default like other IDE environment. Happy coding!

About Victor Leung

Software development professional with expertise in application architecture, cloud solutions deployment, and financial products development. Possess a Master's degree in Computer Science and an MBA in Finance. Highly skilled in AWS (Certified Solutions Architect Professional, Developer and SysOps Administrator), GCP (Professional Cloud Architect), Microsoft Azure, Kubernetes(CKA, CKAD, CKS, KCNA), and Scrum(PSM, PSPO) methodologies.

Happy to connect

Continuous improvement

Copyright © 2023.