Search Unity

Search Results

Search Again
  1. khris1rino
    Post

    Smart Merge not working

    Sounds like a trick to prevent Git from trying to use its own merge tool. Might work if you run into some scenario where Git merges incorrectly...
    Post by: khris1rino, Mar 16, 2017 in forum: Formats & External Tools
  2. khris1rino
    Post

    Smart Merge not working

    @sergeyzr Would be great if you can log a bug (Help->Report a Bug in the menu). That way we can see more information on your setup to debug.
    Post by: khris1rino, Mar 16, 2017 in forum: Formats & External Tools
  3. khris1rino
    Post

    Smart Merge not working

    @PJBowron I see your point now. Will add that to the todo list. Thanks!
    Post by: khris1rino, Feb 6, 2017 in forum: Formats & External Tools
  4. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    @lucasmontec Glad to hear its working for you. Feel free to PM me if you want to share more info on the weirdness you're seeing in your merges.
    Post by: khris1rino, Jan 24, 2017 in forum: Formats & External Tools
  5. khris1rino
    Post

    Smart Merge not working

    @chefgamett Unfortunately UnityYamlMerge can only do merges ... no diff UI at the moment. Sorry for the delay in response.
    Post by: khris1rino, Jan 23, 2017 in forum: Formats & External Tools
  6. khris1rino
    Post

    Smart Merge not working

    @PJBowron If I understand correctly, setting up .unity and .prefab in gitattributes/gitconfig only tells git when to launch UnityYamlMerge. If you...
    Post by: khris1rino, Jan 23, 2017 in forum: Formats & External Tools
  7. khris1rino
    Post

    Smart Merge not working

    @Danilodum14 It merges fine for me (i.e. returning the conflicting changes). Which version of Unity are you on?
    Post by: khris1rino, Jan 20, 2017 in forum: Formats & External Tools
  8. khris1rino
    Post

    Smart Merge not working

    @chefgamett Yes you can use it in P4. Can you try the instructions documented here? https://docs.unity3d.com/Manual/SmartMerge.html
    Post by: khris1rino, Dec 5, 2016 in forum: Formats & External Tools
  9. khris1rino
    Post

    Smart Merge not working

    @ELineCEng Yes that is correct. I'm looking at SmartMerge now. Also yes the issue you mentioned regarding some of the structures like Vector3f,...
    Post by: khris1rino, Nov 21, 2016 in forum: Formats & External Tools
  10. khris1rino
    Post

    Smart Merge not working

    @ELineCEng Thanks for jumping in. Yes those params are required by the merge tool. Btw I'm curious why you exclude the Transform properties. Are...
    Post by: khris1rino, Nov 18, 2016 in forum: Formats & External Tools
  11. khris1rino
    Post

    Smart Merge not working

    Hey Tim - sorry for the delay in response. I checked out the files you posted earlier and do see something going on in those. The merge does get...
    Post by: khris1rino, Nov 17, 2016 in forum: Formats & External Tools
  12. khris1rino
    Post

    Smart Merge not working

    Hi Redphoenix666 - most un-conflicting changes to scenes should merge fine. Although there are definitely cases where the merge can fail. If you...
    Post by: khris1rino, Nov 17, 2016 in forum: Formats & External Tools
  13. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    @lucasmontec Are you getting the "Expected key to point to yaml mapping: m_TexEnvs" error? There have been fixes going into 5.5 beta. If you have...
    Post by: khris1rino, Nov 7, 2016 in forum: Formats & External Tools
  14. khris1rino
    Post

    Smart Merge not working

    Awesome! Good to hear it worked out for you.
    Post by: khris1rino, Sep 20, 2016 in forum: Formats & External Tools
  15. khris1rino
    Post

    Smart Merge not working

    Are you configuring smart merge in your .gitconfig? You should be able to specify paths to mergerules.txt, mergeresolving.txt, mergespecfile.txt...
    Post by: khris1rino, Sep 19, 2016 in forum: Formats & External Tools
  16. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    Hi! I took a look at your files and it appears to be the same issue that Danny ran into. I'll try to get a fix out as soon as I can. Thanks for...
    Post by: khris1rino, Aug 19, 2016 in forum: Formats & External Tools
  17. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    Got it! Thanks for the added info. I'll make a note to send bug to triage. Please use the new bug to track progress.
    Post by: khris1rino, Aug 18, 2016 in forum: Formats & External Tools
  18. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    Hi Danny, Looking at the scene file you attached (case_823535-Level2_-_Blocks_and_Deflection.unity) I see only one Material that is actually "in"...
    Post by: khris1rino, Aug 18, 2016 in forum: Formats & External Tools
  19. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    Hi Danny, Unfortunately looks like there is an issue with the handling of Materials which is blocking the merge operation on your scene file....
    Post by: khris1rino, Aug 18, 2016 in forum: Formats & External Tools
  20. khris1rino
    Post

    UnityYAMLMerge problem: Expected key to point to yaml mapping: m_TexEnvs

    Hi Danny, You can log a bug from right inside Unity editor (Help->Report A Bug). For the problem you describe it will be most helpful if you can...
    Post by: khris1rino, Aug 16, 2016 in forum: Formats & External Tools
Showing results 1 to 20 of 20
Search Again