Git: Applying stashed changes resulted in a conflict

Posted: June 1, 2015 in Git
Tags:
If you're using eGit Eclipse and trying to apply your stash changes and receive error "Applying stashed changes resulted in a conflict" (sometimes your untracked files missing), 
it is better use git stash apply --index


$ cd /your_project_dir/

$ git stash apply --index

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s