• 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 /
avatar image
1
Question by luizssb · Apr 17, 2016 at 11:41 AM · gitsource-control

SourceTree - UnityYaml doesn't open

I'm working on a Unity 5.3.4f project on a Mac with Git as the version control system and I'm trying to use UnityYaml with SourceTree, so I can deal with conflicts within binary resources (such as scenes and prefabs) with relative ease.

I've followed the instructions on how to set everything up as described in the Unity - Manual: Smart Merge:

1- Added the following piece to my .gitconfig file

 [merge]
 tool = unityyamlmerge

 [mergetool "unityyamlmerge"]
 trustExitCode = false
 cmd = '/Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

2- Changed the Merge options at SourceTree -> Preferences -> Diff -> Merge Tool / Merge Command alt text

Additionally, I have also changed the Version Control Mode (at Edit -> Project Settings -> Editor) to "Visible Meta Files"

The problem then is: when I try to launch the external merge tool from within SourceTree to solve a conflict, the following message is shown for less than a second: alt text

What is happening? As far as I understood, it was supposed to open UnityYaml so I could solve the conflict, isn't it? Or have I got it wrong?

untitled.png (75.5 kB)
screen-shot-2016-04-15-at-100831-pm.png (103.7 kB)
Comment
Add comment · Show 1
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
avatar image wreckostudios · Apr 19, 2016 at 02:58 PM 0
Share

I am having the same issue.

2 Replies

· Add your reply
  • Sort: 
avatar image
0
Best Answer

Answer by wreckostudios · Apr 20, 2016 at 03:53 AM

I had the same issue, it turned out that one of the branches in the merge did not have "Force Text" enabled in the project settings. I had to restart Unity after changing the setting for it to sink in.

Comment
Add comment · Show 1 · Share
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
avatar image luizssb · Apr 26, 2016 at 11:39 PM 0
Share

I thought UnityYaml made it possible to solve conflicts in binary files, but it seems this is not possible, then. Thanks for the insight!

avatar image
0

Answer by naughtykid · Nov 05, 2016 at 09:20 PM

I'm having the same issue, but with "force text" enabled.

Comment
Add comment · Share
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

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.

Welcome to Unity Answers

The best place to ask and answer questions about development with Unity.

To help users navigate the site we have posted a site navigation guide.

If you are a new user to Unity Answers, check out our FAQ for more information.

Make sure to check out our Knowledge Base for commonly asked Unity questions.

If you are a moderator, see our Moderator Guidelines page.

We are making improvements to UA, see the list of changes.



Follow this Question

Answers Answers and Comments

5 People are following this question.

avatar image avatar image avatar image avatar image avatar image

Related Questions

Script references broken after cloning from git repository 0 Answers

Looking for libiPhone-lib.a source 0 Answers

problems moving project between computers using Sourcetree and bitbucket, 0 Answers

Git won't find Metafiles 0 Answers

Does Git or SVN work better with Unity? 6 Answers

  • Anonymous
  • Sign in
  • Create
  • Ask a question
  • Spaces
  • Default
  • Help Room
  • META
  • Moderators
  • Explore
  • Topics
  • Questions
  • Users
  • Badges