Geek Answers Handbook

TFS Git Request Pull - Merge Failed (Why?)

We use TFS Git to create and combine download requests. This works great for existing users, but when we add new users to AD (copying the same rights as existing users), transfer requests from new users get an error (merge failed).

Access to TFS, apparently, is provided by adding a user to the project team - users do not have any additional access rights that we can find.

We tried with several new users with different names (everything else is the same as existing users), but we do not quite understand why this is happening.

We also verified that requests for requests created on the same code with existing users do not have this problem.

What can we do to find out why the merge is not performed?

0
source share
2 answers

Try merging branches in Visual Studio to see if there is a conflict or a detailed error message. If there are conflicts, use the merge tool to resolve the conflicts, then execute and click merge.

0
source

Check the Applications and Services Logs => Microsoft-Team Foundation Server => Debugeventvwr.exe file for the following:

LibGit2Sharp.LibGit2SharpException: - "", "" .     LibGit2Sharp.Core.Ensure.HandleError( Int32)     LibGit2Sharp.Core.Proxy.git_signature_new ( , String email, DateTimeOffset )     LibGit2Sharp.Core.Proxy.git_commit_create (RepositorySafeHandle repo, String referenceName, , Signature, String, , GitOid [] parentIds)     LibGit2Sharp.ObjectDatabase.CreateCommit( , Signature, String, , IEnumerable`1, prettifyMessage, Nullable`1 commentChar)     LibGit2Sharp.ObjectDatabase.CreateCommit( , Signature, String, , IEnumerable`1, prettifyMessage)     Microsoft.TeamFoundation.Git.Server.Native.LibGit2NativeLibrary.TryMerge(MergeParameters mergeParameters, CustomerIntelligenceData ciData)     Microsoft.TeamFoundation.Git.Server.ITfsGitRepositoryExtensions.CreateNativeMerge(ITfsGitRepository , IVssRequestContext RequestContext, TfsGitPullRequest pullRequest, targetRefName, Sha1Id targetBranchTipCommit, Sha1Id sourceCommit, CustomerIntelligenceData Cidata, GitPullRequestCompletionOptions completionOptions, Nullable`1 & mergeCommitId, List`1 & includedCommits)     Microsoft.TeamFoundation.Git.Server.TeamFoundationGitPullRequestService.CreateUpToDateMerge(IVssRequestContext requestContext, ITfsGitRepository, TfsGitPullRequest pullRequest, TfsGitRef & targetRef, Boolean forCompletion, CustomerIntelligenceData ciData)

, (< >) .

. , Git, TFS, URI .

0

More articles:


All Articles