Smart Merge not working

I have tried to use the Smart Merge tool to merge changes to my scene file. When I run git mergetool, it crashes. "YAM Merge Tool has stopped working". I have tested this in Windows 7 Command Prompt, Windows Git Bash, and Mac OS X 10.10.3. Both using Unity 5.1.1f1.

On Windows:

Unhandled exception at 0x000000013FBCB999 in UnityYAMLMerge.exe: 0xC0000005: Access violation reading location 0x0000000000000038.

On OS X:
git-mergetool--lib: line 130: 91388 Segmentation fault: 11 'Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge' merge -p $BASE $REMOTE $LOCAL $MERGED

 

OS X 10.10.3 and Unity 5.1.1p3 not working yet.

git-mergetool--lib: line 132: 65378 Segmentation fault: 11 /Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

 

Is the newest version of the tool included in 5.1.1 patch 3?
I wanna do the same thing in OS X tho...

Anyway, thank you very much!

 

You know, it would be really great if this tool was a part of Unity's open bitbucket repos. I am not able to update Unity for every project I would like to use this in, especially this frequently. We don't often have time to keep up with all of the new Unity changes while a project is being developed.

Is this tool so closely tied to Unity that it is impossible for it to be distributed on its own apart from the patch releases?

 

Hello jdrewsen,

I haven't tried your tool in awhile due to not upgrading Unity, but I just did recently. I wanted you to know that tool does not seem to work with Mercurial when it comes to integrating it using the hgrc file.

An error occurs involving the file extension. Mercurial stores its internal files with what appears to be a random hash at the end of the name. For example, if i am trying to merge `scene.unity`, then it will really appear as `scene.unity~other.kxkdf0`

This causes the following error to appear:

"Couldn't locate merge tool to handle extension kxkdf0 in C:\Program Files\Unity\Editor\Data\Tools\mergespecificfile.txt"

EDIT: I just realized adding --force to the hgrc file like so fixes it for Mercurial. You may want to have the documentation changed for this.

unityyamlmerge.args = merge -p --force $base $other $local $output

However, I think there is still a piece of the puzzle I am missing. I get the following output for my specific scene, but I don't have the scene marked as resolved or anything like that.

Code (csharp):

1. merging Assets/Scenes/canvasTest.unity
2. Conflicts:
3. Left  505390102.RectTransform.m_AnchoredPosition.x change to 7.24310017
4. Right 505390102.RectTransform.m_AnchoredPosition.x change to 0
5. Left  505390102.RectTransform.m_AnchoredPosition.y change to -7
6. Right 505390102.RectTransform.m_AnchoredPosition.y change to 0
7. Left  505390102.RectTransform.m_SizeDelta.x change to 10.9860001
8. Right 505390102.RectTransform.m_SizeDelta.x change to 175
9. Left  505390102.RectTransform.m_SizeDelta.y change to 14.6999998
10. Right 505390102.RectTransform.m_SizeDelta.y change to 200
11. Conflict handling:

I am unsure if this tool is changing my scene, or outputting it somewhere, or if it is just throwing the changes away (if it is making any).

EDIT2: I just realized that when UnityYAMLMerge.exe fails to solve all merge conflicts, it falls back on a 3-way mergetool. I was using WinMerge, which is only two-way. I ended up downloading one of the tools found in mergespecificfile.txt. Because it was free, it ended up being Perforce merge. Just be careful about not installing the other things that come along for the ride if you don't want them.

 

I am trying to get the merge tool to work and got as far as git firing it up but it doesnt seem to do anything. Is there a log somewhere so I can try to figure out what is going on? If I launch the yamlmerge tool manually it resolves the conflict, which is just adding a cube and a sphere from two different git clones.

My .gitconfig: (had to replace the single quotes with escaped double quotes to get it to run)

[merge]
tool = unityyamlmerge

[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = 'C:/Program Files/Unity/Editor/Data/Tools/UnityYAMLMerge.exe' merge -p \"$BASE\" \"$REMOTE\" \"$LOCAL\" \"$MERGED\"

My console output:

C:\yamltest\clone2>git mergetool
Merging:
Assets/scene.unity

Normal merge conflict for 'Assets/scene.unity':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (unityyamlmerge):
Conflicts:
Conflict handling:
Assets/scene.unity seems unchanged.
Was the merge successful? [y/n] n
merge of Assets/scene.unity failed


I also tried the tortoisegit route which resolves the conflict but leaves the BASE LOCAL and REMOTE files behind, is this a known issue?

EDIT: I believe this is expected behaviour for tortoisegit as the files go away after resolving the conflict, which you should do after editing the conflict which runs yaml merge.

Thanks, Bas

 

It does not, I get:

fatal: bad config file line 10 in C:\Users\Bassie/.gitconfig

The merger runs which you can see from the console output:

Conflicts:
Conflict handling:

 

Same result (upgraded to git 2.5 now):

C:\yamltest\clone2>git mergetool
Merging:
Assets/scene.unity

Normal merge conflict for 'Assets/scene.unity':
{local}: modified file
{remote}: modified file
Conflicts:
Conflict handling:
Assets/scene.unity seems unchanged.
Was the merge successful? [y/n] n
merge of Assets/scene.unity failed
Continue merging other unresolved paths (y/n) ? n

Is there a log somewhere?

Thanks, Bas

 

I have no idea what happened but it works now, thanks for your help

 

This is really not clear in the documentation, so you might want to add a bit about that in the manual page.

Could it be possible to have the mergerespecfile.txt have a fallback to kdiff3, as it's the merge tool that comes pre-packaged with TortoiseHg ?
I don't know if it's the standard mercurial client on windows, so maybe it's asking for something too specific.

 

I am using UnityYAMLMerge with Source tree, the fallback option is Apple File Merge (opendiff), but every time I resolve the conflict in merge tool and save the merge I get an empty scene file. However everything worked fine with p4merge. Am I doing something wrong with opendiff?

Unity version 5.2.0f3

 

I was testing this out:

https://www.reddit.com/r/Unity3D/comments/39bdq5/how_to_solve_scene_conflicts_with_unitys_smart/

And when I try to merge prefab I recieve a conflict to merge that one, then the difftool (in this case is the vsdiffmerge) opens... I press Ctrl+S to save the result between those files, then I sync the changes to the repo and when I go back to unity these errors appears:

Broken YAML file(Assets/Resources/Game/Prefabs/Loading.prefab). Local file identifier (11485558) doesn't exist!

Component MonoBehaviour could not be loaded when loading game object. Cleaning up!

Here is my setup.

http://imgur.com/KOhQ04O
http://imgur.com/aQnuD9X
http://imgur.com/c1qbIiK

I'm doing it something wrong?

 

Hey,

Using SourceTree i've setup my external tool using quotes (path to program files has a space so it needs to be quoted ). When I try to resolve my issue by merging Sourcetree shows a notification window that get's removed almost instantly ( it's the popup that allows you to abort if needed ). But nothing really happens. When I try to mark it as solved the scene is empty, Unity complains about merge conflicts and need to be solved.

Any idea what im doing wrong?

Edit :

Unity 5.2 *

 

Yes I have set it to Force Text.

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

Argument:
merge -p $BASE $REMOTE $LOCAL $MERGED

Just like the manual said.

 

Didn't work

Here are the remote and local :
https://drive.google.com/folderview?id=0Bw1JcvaePEK_WmN6MGFEamdFVEE&usp=sharing

Where do I find the base?

Either my files are corrupt somewhere or Sourcetree is just deliciously buggy as usual.

 

I just copied my repo and just reset my branch to that commit.
The previous link is still valid, I've added the base file.

Edit:
I've updated git manually as the one from sourcetree is old. Now it looks like it's doing something but also looks like it's stuck. Ill look into it.

 

I have P4merge installed so it should work fine, right?

 

I gave it a couple of minutes and nothing happened.
I could retry and wait longer.

My full path is : C:\Users\SidarTaleiVascoGames\Documents\Development\Unity\D3.4_TALS

Perhaps the . and _ are messing it up?
I do know that p4merge has worked before when moving some projects to git and testing out the workflow.

 

It's running for 15+ minutes now and still no results.

the log file has a bunch of lines non mentioning anything remotely close to the tools being used here. At the end all I read is "
Sub items Errors: 2
"

Shouldn't the command line tool be running in the Task manager? I don't see it either.

Edit:

Set the Merge tool to P4merge, it's not even showing. I think my Sourcetree is broken ( im on windows ). The bugs are getting worse.

edit:

How do I make sure the tool is running?


Edit 3:

No merge tool is initiated. This is really working on my nerves now. I have no clue where to look.

 

I might have set the fallback wrongly. At home currently, tomorrow ill look into it once im at work.

Although the fact p4merge isn't launching on its own is a bit weird.

 

Well, still no success. Sourcetree refuses to run anything with " Launch external merge tool". I even tried to mess up the fallback file which should give me an error, but not even that is showing up.
No merge tool will launch either. Looks like Im going to waste more valuable time.

Edit:

I used resolve using mine and then tried a test case from my coworkers computer. His setup seems to work fine. My setup might be broken (certainly).

 

Well up to this point I still havn't managed to get it working on my pc. I even uninstalled Sourcetree completely and still no luck.

Could you elaborate on what would happen if there are no further conflicts beyond the Yalm merge?
If I hit " external diff", P4Merge runs fine. But it's like the fallback is never called.

 

Sorry I meant I uninstalled completely and reinstalled.

I rather not work from command line every time there is a conflict. I'd have to get the base file manually each time. Unless I'm doing something wrong.

YalmMerge and Sourcetree work fine for my coworkers. But alas I can't merge their files with mine. I'm just left frustrated, it's taking a huge chunk of my work time.

I really can't figure out what tool is causing this. Sourcetree isn't dumping a log file either.

Edit:

In task manager I see many git.exe, I can't kill them either. Any idea what's up with this though?
Also could you send me your fallback file?