Skip to content

Commit

Permalink
Create README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
capyvara authored Aug 1, 2019
1 parent c9e8b91 commit 2590a6c
Showing 1 changed file with 32 additions and 0 deletions.
32 changes: 32 additions & 0 deletions README.md
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.

0 comments on commit 2590a6c

Please sign in to comment.