Getting this error on pulling the changes - LibGit2Sharp.CheckoutConflictException: 1 uncommitted change would be overwritten by merge
1
I have tried making small change and doing commit, but again when i pull i am getting the same error. Error Details: LibGit2Sharp.CheckoutConflictException: 1 uncommitted change would be overwritten by merge at LibGit2Sharp.Core.Ensure.HandleError(Int32 result) in /_/LibGit2Sharp/Core/Ensure.cs:line 154 at LibGit2Sharp.Core.Proxy.git_merge(RepositoryHandle repo, AnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions, Boolean& earlyStop) in /_/LibGit2Sharp/Core/Proxy.cs:line 1320 at LibGit2Sharp.Repository.NormalMerge(AnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options) in /_/LibGit2Sharp/Repository.cs:line 1624 at LibGit2Sharp.Repository.Merge(AnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options) in /_/LibGit2Sharp/Repository.cs:line 1536 at LibGit2Sharp.Repository.Merge(Branch branch, Signature merger, MergeOptions options) in /_/LibGit2Sharp/Repository.cs:line 1262 at Mendix.Modeler.VersionControl.Actions.GitMergeAction.Merge(IRepository repo, Branch featureBranch, Signature signature, FastForwardStrategy fastForwardStrategy) in Mendix.Modeler.VersionControl\Actions\Git\GitMergeAction.cs:line 18 at Mendix.Modeler.VersionControl.Operations.Git.GitUpdateOperation.TryMerge(IRepository repo, Signature signature) in Mendix.Modeler.VersionControl\Operations\Git\GitUpdateOperation.cs:line 107 at Mendix.Modeler.VersionControl.Operations.Git.GitUpdateOperation.DoUpdate(UpdateRequest updateRequest, Repository repo) in Mendix.Modeler.VersionControl\Operations\Git\GitUpdateOperation.cs:line 69