public override Difference Resolve( ConflictContext context, OperationTypeConflictResolver operationTypeConflictResolver, ValueConflictResolver valueConflictResolver) { return(operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch)); }
public override Difference Resolve( ConflictContext context, OperationTypeConflictResolver operationTypeConflictResolver, ValueConflictResolver valueConflictResolver) { return operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch); }
public ValueConflictResolverForm( ConflictContext context, string valueInSourceBranch, string valueInDestinationBranch) { InitializeComponent(); FormPosition.LoadFromRegistry(this); m_result = null; m_conflictcontextcontrol.Data = context; m_textboxValueFromSourceBranch.Text = valueInSourceBranch; m_textboxValueFromDestinationBranch.Text = valueInDestinationBranch; m_buttonAccept.Enabled = false; }
public OperationTypeConflictResolverForm( ConflictContext context, Difference differenceTypeInSourceBranch, Difference differenceTypeInDestinationBranch) { InitializeComponent(); FormPosition.LoadFromRegistry(this); m_result = null; m_conflictcontextcontrol.Data = context; m_radioKeepSource.Tag = differenceTypeInSourceBranch; m_textboxChangeDescriptionFromSourceBranch.Text = differenceTypeInSourceBranch.ToString(); m_radioKeepDestination.Tag = differenceTypeInDestinationBranch; m_textboxChangeDescriptionFromDestinationBranch.Text = differenceTypeInDestinationBranch.ToString(); m_buttonAccept.Enabled = false; }
public abstract Difference Resolve( ConflictContext context, OperationTypeConflictResolver operationTypeConflictResolver, ValueConflictResolver valueConflictResolver);