search

MagikBased / GGS-2024-Collab-Jam

Repo for the 2024 collab jam for the Greater Gaming Society of San Antonio
MIT License
0 stars 0 forks source link

Proposal: set up Unity SmartMerge #6

Open abmarnie opened 4 months ago

abmarnie commented 4 months ago

https://docs.unity3d.com/Manual/SmartMerge.html

TLDR:

  1. Edit > Project Settings > Version Control and select Git (if it's an option).

  2. Create a .gitconfig file at the root of the repo which contains the following:

    [merge]
tool = unityyamlmerge

[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = '<path to UnityYAMLMerge>' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"