search

git-tfs / git-tfs

A Git/TFS bridge, similar to git-svn
http://git-tfs.com/
Apache License 2.0
1.93k stars 718 forks source link

Git pull returns: uncommitted change would be overwritten by merge #1080

Open woakesd opened 7 years ago

woakesd commented 7 years ago

What's frustrating is I have no uncommitted changes and I cannot get a list of what's causing this.

running git tfs pull --debug gives the following:

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 => $/Tools 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.MergeConfli ctException: 1 uncommitted change would be overwritten by merge at LibGit2Sharp.Core.Ensure.HandleError(Int32 result) at LibGit2Sharp.Core.Proxy.git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitC heckoutOpts checkoutOptions) at LibGit2Sharp.Repository.NormalMerge(GitAnnotatedCommitHandle[] annotatedCommits, 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, CultureInf o culture) at Sep.Git.Tfs.Util.GitTfsCommandRunner.Run(GitTfsCommand command, IList1 args) at Sep.Git.Tfs.GitTfs.Main(GitTfsCommand command, IList1 unparsedArgs) at Sep.Git.Tfs.Program.Main(String[] args) 1 uncommitted change would be overwritten by merge

pmiossec commented 7 years ago

Not sure but if I remember well, that's a bug of the Libgit2sharp Dependency that has been fixed.

We already have updated the dependency in the not yet released version.

Try to download the version generated by the AppVeyor build or build your own.

woakesd commented 7 years ago

Thanks, tried to build it but failed and don't really have time to work out why (using VS2017 command line).

Where is the appveyor build?