How do I resolve conflict after popping stash without adding the file to index?

Hi all,

After the user does 'git stash pop', it may result in conflicts.

However, in many cases they may not intend to commit the stashed changes right away, so staging the applied changes is often not what they intend to do. However, the conflict is there until you mark it as resolved.

What's the proper thing to do there? 'git add file.ext' followed by 'git reset file.ext'? Or simply 'git reset file.ext'?

Either will reset already-staged changes from the said file, which is an irreversible operation.

Best regards, Dmitry.