-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
32 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# Unity Smart Merge Wrapper | ||
|
||
Wrapper for installing [Unity Smart Merge](https://docs.unity3d.com/Manual/SmartMerge.html) using | ||
[Homebrew](https://brew.sh/) in OSX | ||
|
||
## Install | ||
|
||
``` | ||
brew tap "capyvara/tap" | ||
brew install "unityyamlmerge" | ||
``` | ||
|
||
## Usage | ||
|
||
```uyaml``` | ||
|
||
### Source control | ||
Follow the [Unity Smart Merge](https://docs.unity3d.com/Manual/SmartMerge.html) guide | ||
replacing `'<path to UnityYAMLMerge>' merge` to `uyaml` only, example `.gitconfig` | ||
|
||
``` | ||
[merge] | ||
tool = unityyamlmerge | ||
[mergetool "unityyamlmerge"] | ||
trustExitCode = false | ||
cmd = 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](https://raw.githubusercontent.com/capyvara/unityyamlmerge/master/mergespecfile.txt) as a template, the `uyaml` wrapper will use this file if it exists. |