search

tgstation / MapDiffBot

Tool for generating diff images of BYOND maps
GNU Affero General Public License v3.0
8 stars 11 forks source link

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

Open DamianX opened 5 years ago

DamianX commented 5 years ago

https://github.com/vgstation-coders/vgstation13/runs/11818721 https://github.com/vgstation-coders/vgstation13/commit/8b7b44c8b1b1f58d63c3e9a2a6cb91019bc3724c

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