private void UpdateMergeSettings() { var gitAttributesPath = Environment.RepositoryPath.Combine(".gitattributes"); if (gitAttributesPath.FileExists()) { var readAllText = gitAttributesPath.ReadAllText(); var containsLegacyUnityYamlMergeError = readAllText.Contains("unityamlmerge"); if (containsLegacyUnityYamlMergeError) { ConfigureMergeSettings("unityamlmerge"); } } GitClient.UnSetConfig("merge.unityyamlmerge.cmd", GitConfigSource.Local).Catch(e => { Logger.Error(e, "Error removing merge.unityyamlmerge.cmd"); return(true); }).RunSynchronously(); GitClient.UnSetConfig("merge.unityyamlmerge.trustExitCode", GitConfigSource.Local).Catch(e => { Logger.Error(e, "Error removing merge.unityyamlmerge.trustExitCode"); return(true); }).RunSynchronously(); ConfigureMergeSettings(); }