git stash apply results in the conflict

i've tried unstash changes , git reported conflict:

auto-merging core/scaldi/modules.scala conflict (content): merge conflict in core/scaldi/modules.scala

i'm curious why conflict occurs, since have no changes neither in working directory nor in index:

git diff          #outputs nothing git diff --cached #outputs nothing git status        #outputs `nothing commit, working directory clean`

'm curious why conflict occurs, since have no changes neither in working directory nor in index:

it's not enough. seems stashed changes commits ago.

assume tree looks this:

a------b------c------d[master]         \                          stashed -------^ (stash apply)          sources

so stashed file changes of core/scaldi/modules.scala conflicts changes in c or d.

Plus Code