/// <summary>
/// Handles the ResolvedConflict event of the versionControlServer control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="Microsoft.TeamFoundation.VersionControl.Client.ResolvedConflictEventArgs"/> instance containing the event data.</param>
/// <remarks>Documented by CFI, 2010-06-27</remarks>
protected void versionControlServer_ResolvedConflict(object sender, ResolvedConflictEventArgs e)
{
MessageBox.Show("Conflict solved: " + e.Conflict.MergedFileName);
}
private void VersionControlServer_ResolvedConflict(object sender, ResolvedConflictEventArgs e)
{
RefreshConflictsAsync();
}