diego-augusto

1. In Unity, go to Edit > Project Settings > Edit > Asset Serialization > Mode and select Force Text.
2. Add UnityYAMLMerge.exe in %PATH%. (C:\Program Files\Unity\Editor\Data\Tools)
3. In .gitconfig (C:\Users<user>) add at the end of the file:

	[merge]
		tool = unityyamlmerge
	[mergetool "unityyamlmerge"]
		trustExitCode = false
		cmd = UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

mdomrach

using UnityEngine;
using System.Collections.Generic;

[RequireComponent(typeof(MeshRenderer))]
[RequireComponent(typeof(MeshFilter))]
public class GridMesh : MonoBehaviour
{
    public int GridSize;

    void Awake()