Search Unity

Smart Merge local and remote parameters swapped

Discussion in 'Formats & External Tools' started by Trisibo, Oct 25, 2018.

  1. Trisibo

    Trisibo

    Joined:
    Nov 1, 2010
    Posts:
    245
    According to the documentation for Smart Merge (https://docs.unity3d.com/Manual/SmartMerge.html), the parameters in the Git configuration file are:
    However, I was getting the remote and local files swapped on my fallback tool. After some tests, I'm confident it's an issue with Smart Merge, either the remote and local parameters are swapped in the documentation about the Git configuration file, or they are swapped in the mergespec file (I don't mean that the commands for common tools have the parameters swapped with respect to the correct positions, but that actually with "%r" I get the local file, and with "%l" I get the remote file, with my own test tool).

    I'm using the Smart Merge that comes with Unity 2018.1.4f1, I don't recall seeing the issue with previous versions, but it's not something I really checked thoroughly.
     
  2. Trisibo

    Trisibo

    Joined:
    Nov 1, 2010
    Posts:
    245
    Bump...