Cannot get latest from TFS

I am trying to get latest from TFS to sync with Git but am facing a conflict error when i do a pull. My branch is clean and I’m unable to checkin either. If I try to commit or reset, git says my working tree is clean

E:\WarpDrive\Compare>git-tfs pull --debug
Command run:git tfs pull --debug
No authors file used.
git-tfs version 0.25.1.0 (TFS client library 14.0.0.0 (MS)) (64-bit)
Commits visited count:2
Working with tfs remote: default => $/System/Branches/FeatureBranches/Compare
Fetching from TFS remote 'default'...
Commits visited count:1
Commits visited count:2
Cleaning... System.Reflection.TargetInvocationException: Exception has been thrown by the target of an invocation. ---> LibGit2Sharp.MergeConflictException: 8 conflicts prevent checkout
   at LibGit2Sharp.Core.Ensure.HandleError(Int32 result)
   at LibGit2Sharp.Core.Proxy.git_checkout_tree(RepositorySafeHandle repo, ObjectId treeId, GitCheckoutOpts& opts)
   at LibGit2Sharp.Repository.CheckoutTree(Tree tree, IList`1 paths, IConvertableToGitCheckoutOpts opts)
   at LibGit2Sharp.Repository.FastForwardMerge(GitAnnotatedCommitHandle annotatedCommit, Signature merger, MergeOptions options)
   at LibGit2Sharp.Repository.Merge(GitAnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options)
   at LibGit2Sharp.Repository.Merge(Commit commit, Signature merger, MergeOptions options)
   at Sep.Git.Tfs.Core.GitRepository.Merge(String commitish)
   at Sep.Git.Tfs.Commands.Pull.Run(String remoteId)
   --- End of inner exception stack trace ---
   at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor)
   at System.Reflection.RuntimeMethodInfo.UnsafeInvokeInternal(Object obj, Object[] parameters, Object[] arguments)
   at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
   at Sep.Git.Tfs.Util.GitTfsCommandRunner.Run(GitTfsCommand command, IList`1 args)
   at Sep.Git.Tfs.GitTfs.Main(GitTfsCommand command, IList`1 unparsedArgs)
   at Sep.Git.Tfs.Program.Main(String[] args)
8 conflicts prevent checkout

[VitalyBrusentsev]

Hi everyone,

I have also recently encountered the same issue. Unfortunately, using @pmiossec’s binaries did not help. As fetch always succeeds, and the problem occurs at the merge stage of pull operation, and I use git-tfs exclusively for importing from TFS, I was able to bypass it by replacing

git tfs pull

with

git tfs fetch
git reset tfs/default --hard

You can replace tfs/default with your respective tfs remote names. Hope this helps.

[pmiossec]

Could you test the last dev version that you will find here: https://ci.appveyor.com/project/pmiossec/git-tfs-v2qcm/build/0.25.1.442/artifacts

I hope it is something fixed in a more recent version of LibGit2Sharp…