Closed commit application "..." failed due to "Application ... egit error in eclipse

Question

I try to apply the stash that I did through eclipse, but I get the following error message: Applying a closed commit "..." failed due to "Applying hidden changes led to conflict." How can I resolve conflicts in eclipse? tried to open the synchronization view, but I did not see anything that needed to be solved ... using eclipse kepler.

Answer 1

I had the same problem when I hid some kind of work that I did to do the last minute, urgent fixing of errors.

, Eclipse ( , Luna):

• Eclipse → →
• "" "", " ...".
• .
• ,
• .

Answer 2

, . reset HARD, , (, , ):

git stash apply --index

, "" . , GUI .

Eclipse Luna.

Answer 3

, stashed commit neon.1 . egit

Answer 4

, .

, <<<<<, git , git, , .

, , .

Answer 5

, - , , .

TortoiseGit, .

, :)

Answer 6

==>

1. stash
2. /
3. Index/Head

==>

"Git Staging", => => & lt;....>.

. , .

Answer 7

eclipse Oxygen , Team > Stashes, stash, , "Stashed Commit" ( " " ). , .