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. Create account

Language

Question by YamashiroKai · Sep 09, 2017 at 07:39 PM · git merge version-control source-control

How to properly set up YAMLMerge and a merge tool on windows

Is there a proper and thorough guide on how to set up YAML merge on windows?

I tried to follow this: https://stackoverflow.com/a/45738772/4279201

but Meld is always showing this:

alt text

And I also got these many zero files as conflicts on each small change (do I even need them?) and the only way to "resolve" them is to launch the external merge tool (which I don't think work).

So is there a proper guide on how to set this up?

Add comment

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.