public void OnConflict(object sender, SvnConflictEventArgs e)
{
if (_synchronizer != null && _synchronizer.InvokeRequired)
{
// If needed marshall the call to the UI thread
e.Detach(); // Make this instance thread safe!
_synchronizer.Invoke(new EventHandler <SvnConflictEventArgs>(OnConflict), new object[] { sender, e });
return;
}
AnkhConfig config = GetService <IAnkhConfigurationService>().Instance;
if (config.InteractiveMergeOnConflict)
{
// Only call interactive merge if the user opted in on it
if (_currentMergeConflictHandler == null)
{
_currentMergeConflictHandler = CreateMergeConflictHandler();
}
_currentMergeConflictHandler.OnConflict(e);
}
}
public void OnConflict(object sender, SvnConflictEventArgs e)
{
if (_synchronizer != null && _synchronizer.InvokeRequired)
{
// If needed marshall the call to the UI thread
e.Detach(); // Make this instance thread safe!
_synchronizer.Invoke(new EventHandler <SvnConflictEventArgs>(OnConflict), new object[] { sender, e });
return;
}
_currentMergeConflictHandler.OnConflict(e);
}
