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

Reproduce el caso usando repository.Stashes.Add con IncludeUntracked, repository.Merge, repository.Stashes.Pop(0) y repository.Index.Conflicts en LibGit2Sharp 0.27.0-preview-0034. Primero inspecciona cómo stash pop informa de los conflictos cuando un archivo no rastreado colisiona con un archivo rastreado y, después, verifica que el conflicto se expone a través del índice mientras el archivo de trabajo sigue modificado con marcadores de conflicto.