Git stash pop behaviour with

Reproduction steps

• In branch A with master as remove we have a new file untracked.
• In master we have added the same file already and it's part of commit a123

we are updating branch A to the commit a123 so we are doing:

var stash = repository.Stashes.Add(signature, StashModifiers.IncludeUntracked);
repository.Merge('a123', signature);

if (stash != null)
{
	repository.Stashes.Pop(0);
}

if(repository.Index.Conflicts.Any()){
      showUserAllTheConflictsAndGiveOptionsToFixThem
}

Expected behavior

When doing the Pop the change should get marked as having a conflict and being modified

Actual behavior

There won't be any conflicts even though the file is marked as modified and has been modified with the conflict markers

Version of LibGit2Sharp (release number or SHA1)

0.27.0-preview-0034

Operating system(s) tested; .NET runtime tested

Windows Server 2012; .NET 4.7.2

在 LibGit2Sharp 0.27.0-preview-0034 上，使用带有 IncludeUntracked 的 repository.Stashes.Add、repository.Merge、repository.Stashes.Pop(0) 和 repository.Index.Conflicts 重现该情况。首先检查未跟踪文件与已跟踪文件发生冲突时 stash pop 如何报告冲突，然后验证该冲突会通过索引暴露出来，同时工作文件仍处于带有冲突标记的修改状态。