1 Setup

Thibaut CHARLES (CromFr) edited this page 2016-02-10 18:39:55 +00:00

Table of Contents

• Unity file merge

Unity file merge

Ajouter au fichier ~/.gitconfig (ou C:\Users\$USER\.gitconfig)

[mergetool "unity"]
	trustExitCode = false
	cmd = 'C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -p$BASE$REMOTE$LOCAL$MERGED