AutoMerge.BranchesViewModel.MergeByFile C# (CSharp) Method

        private MergeResult MergeByFile(Change[] changes, string targetBranch, List<MergeRelation> mergeRelationships,
            VersionSpec version, MergeOption mergeOption, Workspace workspace)
        {
            if (!GetLatest(targetBranch, mergeRelationships, workspace))
            {
                return MergeResult.CanNotGetLatest;
            }

            var mergeOptions = ToTfsMergeOptions(mergeOption);
            var hasConflicts = false;
            foreach (var change in changes)
            {
                var mergeRelation =
                    mergeRelationships.FirstOrDefault(
                        r => r.Item == change.Item.ServerItem && r.Target.StartsWith(targetBranch));
                if (mergeRelation != null)
                {
                    var recursionType = CalculateRecursionType(mergeRelation);
                    var status = workspace.Merge(mergeRelation.Source, mergeRelation.Target, version, version,
                        LockLevel.None, recursionType, mergeOptions);
                    if (!hasConflicts && HasConflicts(status))
                    {
                        hasConflicts = true;
                    }
                }
                else
                {
                    Logger.Info("File {0} not merged to branch {1}", change.Item.ServerItem, targetBranch);
                }
            }

            if (hasConflicts)
            {
                var conflicts = AutoResolveConflicts(workspace, targetBranch, mergeOption);
                if (!conflicts.IsNullOrEmpty())
                {
                    return IsTryRestoreUnexpectedFile(conflicts)
                        ? MergeResult.UnexpectedFileRestored
                        : MergeResult.HasConflicts;
                }
            }

            return MergeResult.Merged;
        }