public void ChooseConflictFile(ConflictViewModel conflict, ConflictOptionViewModel conflictOption)
        {
            if (!this.ResolveConflict(conflict.ConflictSet, conflictOption.ConflictOption.FilePath))
            {
                return;
            }

            // The conflict will no longer exist, so remove it
            this.Conflicts.Remove(conflict);
        }
        public void ChooseConflictFile(ConflictOptionViewModel conflictOption)
        {
            if (!this.ResolveConflict(this.SelectedConflict.ConflictSet, conflictOption.ConflictOption.FilePath))
            {
                return;
            }

            // The conflict will no longer exist, so remove it
            var correspondingVm = this.Conflicts.First(x => x.ConflictOptions.Contains(conflictOption));

            this.Conflicts.Remove(correspondingVm);
        }
Exemplo n.º 3
0
 public void ChooseConflictFile(ConflictOptionViewModel conflictOption)
 {
     this.Delegate.ChooseConflictFile(this.Conflict, conflictOption);
 }
        public void ChooseConflictFile(ConflictOptionViewModel conflictOption)
        {
            if (!this.ResolveConflict(this.SelectedConflict.ConflictSet, conflictOption.ConflictOption.FilePath))
                return;

            // The conflict will no longer exist, so remove it
            var correspondingVm = this.Conflicts.First(x => x.ConflictOptions.Contains(conflictOption));
            this.Conflicts.Remove(correspondingVm);
        }