<table border="1" cellspacing="0" cellpadding="8">
    <tr>
        <th>Issue</th>
        <td>
            <a href=https://github.com/llvm/llvm-project/issues/60735>60735</a>
        </td>
    </tr>

    <tr>
        <th>Summary</th>
        <td>
            clang-format-vs causing issues on resolving conflicts
        </td>
    </tr>

    <tr>
      <th>Labels</th>
      <td>
            new issue
      </td>
    </tr>

    <tr>
      <th>Assignees</th>
      <td>
      </td>
    </tr>

    <tr>
      <th>Reporter</th>
      <td>
          JVApen
      </td>
    </tr>
</table>

<pre>
    When resolving conflicts via visual studio, a visual studio merge window is opened which stores a temporary file in a subdir of %TEMP% till the resolving is completed. As %TEMP% does not have the same .clang-format file being discovered as the original file, this falls back to the default formatting.
</pre>
<img width="1px" height="1px" alt="" src="http://email.email.llvm.org/o/eJxsksGunDoMhp8mbKxBYOAwLFjMve0sKlXqomrXgRhwGxIUJ4zO21cwlTqquooUff7s_I4W4dkR9ar5TzUfMp3i4kP_6dttI5cN3rz33xdyEEi83dnNMHo3WR6jwM4adpakLUhMhr3C_-GvK1gpzAQPdsY_gAX8Ro4MPBYeF5DoAwloiLRuPujwDhNbAnagQdJgOICfQGHz9ePnLwobiGwtxIVeBmKB0a-bpUgmh5u84saTgPMRFr3TWSd6JchHq918mXxYdXy2HOhwGZbR7xTIgJaT94Fndtqe1PHAuLDApK0VGPT4E6I_OUOTTjbC0xnZzXlm-sp0Vacz6su39q1qS8Q6W_pr0dLUNE1bdEhYXbG8dqYdq26asGmKNuMeC6wKLOuyqAusc7y2HZVTU5lr16LWqi5o1Wxza_c192HOWCRR_1a0VZNZPZCVc6WIjo7cJZFCPDYc-qPmMqRZVF1Ylih_LJGjpf41ncsuMOokz6QlkYD_53fIUrD9EuMmqropvCu8zxyXNOSjXxXejx6_j8sW_A8ao8L7U6nwfk7-KwAA__-ie9zY">