Wayback Machinekoobas.hobune.stream
May JUN Jul
Previous capture 12 Next capture
2021 2022 2023
1 capture
12 Jun 22 - 12 Jun 22
sparklines
Close Help
  • Products
  • Solutions
  • Made with Unity
  • Learning
  • Support & Services
  • Community
  • Asset Store
  • Get Unity

UNITY ACCOUNT

You need a Unity Account to shop in the Online and Asset Stores, participate in the Unity Community and manage your license portfolio. Login Create account
  • Blog
  • Forums
  • Answers
  • Evangelists
  • User Groups
  • Beta Program
  • Advisory Panel

Navigation

  • Home
  • Products
  • Solutions
  • Made with Unity
  • Learning
  • Support & Services
  • Community
    • Blog
    • Forums
    • Answers
    • Evangelists
    • User Groups
    • Beta Program
    • Advisory Panel

Unity account

You need a Unity Account to shop in the Online and Asset Stores, participate in the Unity Community and manage your license portfolio. Login Create account

Language

  • Chinese
  • Spanish
  • Japanese
  • Korean
  • Portuguese
  • Ask a question
  • Spaces
    • Default
    • Help Room
    • META
    • Moderators
    • Topics
    • Questions
    • Users
    • Badges
  • Home /
  • Help Room /
avatar image
0
Question by MatthewKyeo · Aug 01, 2017 at 09:17 AM · merge

UnityYAMLMerge does not run with SourceTree

Hi, I'm Matthew, a newcomer with Unity 5.

I use

  • Unity 5.6.1 (2017.1.0f3 ,64-bit)

  • 64-bit Windows 10 desktop

  • SourceTree 2.1.7

  • Git 2.13

  • P4Merge 2017.2

  • Survival Shooter tutorial

and the tutorial project is configured to "Asset Serialization, Mode - Force Text". to test the "Smart Merge" feature.

In the Smart Merge doc, it mentions a configuration for SourceTree.

alt text

I have tried that configuration, but when I "diff" a file, the UnityYAMLMerge does not run.

Check my shared video, please; I recorded that nothing happens after configuring UnityYAMLMerge and executing "External Diff".

I also noticed that the ".gitconfig" file didn't change after configuring UnityYAMLMerge.

 [difftool "sourcetree"]
     cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
 [mergetool "sourcetree"]
     cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
     trustExitCode = true
 [user]
     email = matt@xxx.xxx
     name = MATTHEW_DESKTOP0

I thought the UnityYAMLMerge would be added to the ".gitconfig" file, but nothing happened.

Here is another video I have recorded; Although I have followed the UnityYAMLMerge configuration for SourceTree, P4Merge pops up.

 [core]
     repositoryformatversion = 0
     filemode = false
     bare = false
     logallrefupdates = true
     symlinks = false
     ignorecase = true
 [remote "origin"]
     url = https://gitlab.com/XXXXXX.git
     fetch = +refs/heads/*:refs/remotes/origin/*
 [user]
     name = MATTHEW_DESKTOP0
     email = matt@xxx.xxx

There was nothing related to UnityYAMLMerge in the ".git/config" file, either.

Is my configuration wrong?

  • Diff Command: C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exe

  • Arguments: merge -p $BASE $REMOTE $LOCAL $MERGED

  • In mergespecfile.txt (fallout to P4Merge)

    unity use "C:\Program Files\Perforce\p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

    prefab use "C:\Program Files\Perforce\p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

ref. link

Is it impossible for UnityYAMLMerge to diff a previously committed file?

Or do I need to type something manually in the .gitconfig file?

-KIND REGARDS, MATTHEW

extdiff.png (15.1 kB)
Comment
Add comment
10 |3000 characters needed characters left characters exceeded
▼
  • Viewable by all users
  • Viewable by moderators
  • Viewable by moderators and the original poster
  • Advanced visibility
Viewable by all users

0 Replies

· Add your reply
  • Sort: 

Your answer

Hint: You can notify a user about this post by typing @username

Up to 2 attachments (including images) can be used with a maximum of 524.3 kB each and 1.0 MB total.

Follow this Question

Answers Answers and Comments

109 People are following this question.

avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image

Related Questions

Merging two projects into one 0 Answers

Combining Two shaders 0 Answers

Combine two game objects destroy them and create a new one 0 Answers

Error with admob, couldn't merge andriod manifest files 0 Answers

Manifest Merge Problem 1 Answer


Enterprise
Social Q&A

Social
Subscribe on YouTube social-youtube Follow on LinkedIn social-linkedin Follow on Twitter social-twitter Follow on Facebook social-facebook Follow on Instagram social-instagram

Footer

  • Purchase
    • Products
    • Subscription
    • Asset Store
    • Unity Gear
    • Resellers
  • Education
    • Students
    • Educators
    • Certification
    • Learn
    • Center of Excellence
  • Download
    • Unity
    • Beta Program
  • Unity Labs
    • Labs
    • Publications
  • Resources
    • Learn platform
    • Community
    • Documentation
    • Unity QA
    • FAQ
    • Services Status
    • Connect
  • About Unity
    • About Us
    • Blog
    • Events
    • Careers
    • Contact
    • Press
    • Partners
    • Affiliates
    • Security
Copyright © 2020 Unity Technologies
  • Legal
  • Privacy Policy
  • Cookies
  • Do Not Sell My Personal Information
  • Cookies Settings
"Unity", Unity logos, and other Unity trademarks are trademarks or registered trademarks of Unity Technologies or its affiliates in the U.S. and elsewhere (more info here). Other names or brands are trademarks of their respective owners.
  • Anonymous
  • Sign in
  • Create
  • Ask a question
  • Spaces
  • Default
  • Help Room
  • META
  • Moderators
  • Explore
  • Topics
  • Questions
  • Users
  • Badges