git stash apply results in the conflict - why?

Question

I've just tried to unstash changes and git reported a conflict:

Auto-merging core/scaldi/modules.scala
CONFLICT (content): Merge conflict in core/scaldi/modules.scala

I'm curious as to why this conflict occurs, since I have no changes neither in working directory nor in the index:

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

score 3 · Answer 1 · answered Apr 01 '15 at 13:24

3

'm curious as to why this conflict occurs, since I have no changes neither in working directory nor in the index:

It's not enough. Seems you stashed changes some commits ago.

Assume your tree looks like this:

A------B------C------D[master]
        \                
         stashed -------^ (stash apply)
         sources

So stashed file changes of core/scaldi/modules.scala conflicts with some changes in C or D.

answered Apr 01 '15 at 13:24

phts

thanks, how is determined whether stash will apply cleanly or not? in the same way as a 3-way merge? Can you please elaborate on this? – Max Koretskyi Apr 01 '15 at 13:37

score 0 · Answer 2 · answered Mar 11 '20 at 12:40

0

Solution that worked for me.

Imagine you were working in branch feature/abc

answered Mar 11 '20 at 12:40

Tung Fam

2 Answers2