idea Git unstash failed

Questions are as follows

insert image description here
When I click unstash changes to restore the previous local modification, a prompt as shown in the figure pops up.
It is found that the misc.xml file under the .idea folder has a conflict (and the remote end).

solve

Execute Git --> stash changes again to hide the changes of this file.

Then click unstash changes and select the changes list that you want to restore before~

Guess you like

Origin blog.csdn.net/qq_36256590/article/details/130388102