C# (CSharp) ConflictContext Examples

Example #1

 public override Difference Resolve(
     ConflictContext context,
     OperationTypeConflictResolver operationTypeConflictResolver,
     ValueConflictResolver valueConflictResolver)
 {
     return(operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch));
 }

Example #2

File: OperationTypeConflict.cs Project: configit-open-source/csmerge

 public override Difference Resolve(
             ConflictContext context,
             OperationTypeConflictResolver operationTypeConflictResolver,
             ValueConflictResolver valueConflictResolver)
 {
     return operationTypeConflictResolver(context.CreateSubcontext(this), r_differenceInSourceBranch, r_differenceInDestinationBranch);
 }

Example #3

        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;
        }

Example #4

File: ValueConflictResolverForm.cs Project: configit-open-source/csmerge

        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;
        }

Example #5

File: OperationTypeConflictResolverForm.cs Project: m3zercat/slntools

        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;
        }

Example #6

File: OperationTypeConflictResolverForm.cs Project: wave-rider/slntools

        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;
        }

Example #7

File: Conflict.cs Project: wave-rider/slntools

 public abstract Difference Resolve(
     ConflictContext context,
     OperationTypeConflictResolver operationTypeConflictResolver,
     ValueConflictResolver valueConflictResolver);

Example #8

File: Conflict.cs Project: m3zercat/slntools

 public abstract Difference Resolve(
                 ConflictContext context,
                 OperationTypeConflictResolver operationTypeConflictResolver,
                 ValueConflictResolver valueConflictResolver);