Applying stashed commit '…' failed due to 'Applying… egit error in eclipse
i am trying to apply a stash that I did through eclipse but I am getting the next error message :
Applying stashed commit ‘…’ failed due to ‘Applying stashed changes resulted in a conflict’.
how can I resolve the conflicts in eclipse ? tried to open sync view but I didn’t see anything that need to be resolved…
using eclipse kepler.
5 Solutions collect form web for “Applying stashed commit '…' failed due to 'Applying… egit error in eclipse”
I had the same problem when I stashed some work I was doing in order to do some last minute, urgent bug fixing.
In order to overcome this situation, I did the following in Eclipse (note that I used Luna version):
- Right click on the Eclipse project -> Team -> Show in Repositories View
- Find the “References” folder in the Repositories View, right click it, then select the “New Branch…” option.
- Create a new branch with the stashed changes.
- Checkout the original branch on which you want to apply the stash
- Merge both branches and resolve conflicts the usual way.
This commonly happens when you stash your changes in one branch and apply them on another.
To resolve these conflicts, you need to search for
<<<<< which are git markers that git uses to tell you where and which branches have the conflicts.
Here’s an exhaustive link that explains how to resolve the conflicts.
I had this happen when I included untracked files in my stash. I did a reset HARD to clear my working copy, then ran this from the command-line (the stash I wanted was on top of the stack):
git stash apply --index
Now I see my modified files, and my “untracked” files reappear. Not sure why the GUI doesn’t work.
Using Eclipse Luna.
I get this error every time I apply changes from stashed commit in neon.1
Looks like a bug. One of many bugs in egit
Maybe you have change something and you need to stash this changes then you could apply the other stash.
I have used TortoiseGit and it said me more info about this problem.
Hope it’s helps to resolve your problem 🙂