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 如何回報衝突，然後驗證該衝突會透過索引暴露出來，同時工作檔案仍處於帶有衝突標記的修改狀態。