Skip to content

LibGit2Sharp.CheckoutConflictException: 1 uncommitted change would be overwritten by merge #97

@DamianX

Description

@DamianX

https://github.com/vgstation-coders/vgstation13/runs/11818721
vgstation-coders/vgstation13@8b7b44c

LibGit2Sharp.CheckoutConflictException: 1 uncommitted change would be overwritten by merge
   at LibGit2Sharp.Core.Ensure.HandleError(Int32 result)
   at LibGit2Sharp.Repository.NormalMerge(AnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options)
   at LibGit2Sharp.Repository.Merge(AnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options)
   at LibGit2Sharp.Repository.Merge(Commit commit, Signature merger, MergeOptions options)
   at MapDiffBot.Core.LocalRepository.<>c__DisplayClass14_0.<Merge>b__0() in /src/MapDiffBot/LocalRepository.cs:line 123
   at System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state)
   at System.Threading.Tasks.Task.ExecuteWithThreadLocal(Task& currentTaskSlot)
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at MapDiffBot.Core.PayloadProcessor.<GenerateDiffs>d__14.MoveNext() in /src/MapDiffBot/PayloadProcessor.cs:line 405
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at MapDiffBot.Core.PayloadProcessor.<GenerateDiffs>d__14.MoveNext() in /src/MapDiffBot/PayloadProcessor.cs:line 411
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at MapDiffBot.Core.PayloadProcessor.<ScanPullRequestImpl>d__13.MoveNext() in /src/MapDiffBot/PayloadProcessor.cs:line 199

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions