Ufdjrw

Could solar power be utilized and substitute coal in the 19th century?

What will be the benefits of Brexit?

What is the oldest known work of fiction?

Can I rely on these GitHub repository files?

Is there an Impartial Brexit Deal comparison site?

How to prevent YouTube from showing already watched videos?

Can I use my Chinese passport to enter China after I acquired another citizenship?

How can I successfully establish a nationwide combat training program for a large country?

Can a Bard use an arcane focus?

What to do when my ideas aren't chosen, when I strongly disagree with the chosen solution?

What does 사자 in this picture means?

What if somebody invests in my application?

How to color a zone in Tikz

Why are all the doors on Ferenginar (the Ferengi home world) far shorter than the average Ferengi?

Why isn't KTEX's runway designation 10/28 instead of 9/27?

No idea how to draw this using tikz

Invariance of results when scaling explanatory variables in logistic regression, is there a proof?

Giant Toughroad SLR 2 for 200 miles in two days, will it make it?

How can I raise concerns with a new DM about XP splitting?

Indicating multiple different modes of speech (fantasy language or telepathy)

Have I saved too much for retirement so far?

Why Were Madagascar and New Zealand Discovered So Late?

Identify a stage play about a VR experience in which participants are encouraged to simulate performing horrific activities

Lifted its hind leg on or lifted its hind leg towards?

Git add Unity SmartMerge config for both mac and windows

How can I add an empty directory to a Git repository?Git for beginners: The definitive practical guideIgnoring directories in Git repos on WindowsHow to undo 'git add' before commit?Difference between “git add -A” and “git add .”Rename master branch for both local and remote Git repositoriesHow do I delete a Git branch both locally and remotely?Where does git config --global get written to?How do I show my global git config?Various ways to remove local Git changes

1

0

I want to integrate Unity SmartMerge in my Unity project. For this you need to add the following to the git config:

[merge]
tool = unityyamlmerge

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

The path <path to UnityYAMLMerge> needs to be replaced with the location of the UnityYAMLMerge. On Mac it would be Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge
and on Windows, it would be C:Program FilesUnityEditorDataToolsUnityYAMLMerge.exe.

---

My Question is if it is possible to add both to the git config? Is there a way, that this runs on both Windows and Mac?

git unity3d vuforia

share|improve this question

asked Mar 7 at 9:52

thsnkrthsnkr

62

add a comment | 

1

0

I want to integrate Unity SmartMerge in my Unity project. For this you need to add the following to the git config:

[merge]
tool = unityyamlmerge

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

The path <path to UnityYAMLMerge> needs to be replaced with the location of the UnityYAMLMerge. On Mac it would be Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge
and on Windows, it would be C:Program FilesUnityEditorDataToolsUnityYAMLMerge.exe.

---

My Question is if it is possible to add both to the git config? Is there a way, that this runs on both Windows and Mac?

git unity3d vuforia

share|improve this question

asked Mar 7 at 9:52

thsnkrthsnkr

62

add a comment | 

I want to integrate Unity SmartMerge in my Unity project. For this you need to add the following to the git config:

[merge]
tool = unityyamlmerge

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

The path <path to UnityYAMLMerge> needs to be replaced with the location of the UnityYAMLMerge. On Mac it would be Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge
and on Windows, it would be C:Program FilesUnityEditorDataToolsUnityYAMLMerge.exe.

---

My Question is if it is possible to add both to the git config? Is there a way, that this runs on both Windows and Mac?

git unity3d vuforia

share|improve this question

asked Mar 7 at 9:52

thsnkrthsnkr

62

[merge]
tool = unityyamlmerge

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

share|improve this question

asked Mar 7 at 9:52

thsnkrthsnkr

62

share|improve this question

asked Mar 7 at 9:52

thsnkrthsnkr

62

asked Mar 7 at 9:52

thsnkrthsnkr

62

asked Mar 7 at 9:52

thsnkrthsnkr

62