README.md

Unity Smart Merge Wrapper

Wrapper for installing Unity Smart Merge using Homebrew in OSX

Install

brew tap "capyvara/tap"

brew install "unityyamlmerge"

Usage

uyaml

Source control

Follow the Unity Smart Merge guide replacing '<path to UnityYAMLMerge>' merge to /usr/local/bin/uyaml only, example .gitconfig

[merge]
tool = unityyamlmerge

[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = /usr/local/bin/uyaml -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

Custom fallback file

If you dont't want to use default fallback file (uses Apple File Merge), create a ~/.uyamlspec.txt file, use the default as a template, the uyaml wrapper will use this file if it exists.