Eclipse Community Forums: EGit / JGit » Stash apply result in conflicts even there are no conflicts different from command line

Home » Eclipse Projects » EGit / JGit » Stash apply result in conflicts even there are no conflicts different from command line(After pull the remote changes and made some local changes after that stash apply throwing "Apply result in conflict" even there is no conflicts shows to user which is different from command)

Show: Today's Messages :: Show Polls :: Message Navigator

Stash apply result in conflicts even there are no conflicts different from command line [message #1729444]

Thu, 14 April 2016 08:43

kishore routhu

Messages: 4
Registered: March 2014

Junior Member

I am using the jgit api versioned 3.6.0.201411121045-m1.
I have some local changes im my repository and doing the following steps.

1. Stage the all local changes.
2. Stash these changes.
3. Pull the remote changes to local.
4. And made some local changes ( ex: pom.xml ) which doesn't result in any conflict.
5. Stash apply the changes on latest commit.

Results : Applying stashed changes resulted in a conflict
org.eclipse.jgit.api.errors.StashApplyFailureException: Applying stashed changes resulted in a conflict

But it doesn't show any conflicts and stash is not applying.

If i do the 5th step manually through (git stash apply) it is successfull and showing all changes from the stash also.

Why these difference between COMMAND and API ?
Is the version 3.6.0.201411121045-m1 should be changed in my dependency section ?
If version needs to be upgraded then what is the suggested version for this fix ?

Any suggestions will be appreciated

Thank You

[Updated on: Thu, 14 April 2016 08:44]

Report message to a moderator

Re: Stash apply result in conflicts even there are no conflicts different from command line [message #1729527 is a reply to message #1729444]

Fri, 15 April 2016 06:46

Matthias Sohn

Messages: 1268
Registered: July 2009

Senior Member

Why are you using a pretty old milestone version.
Find the current release 4.3 here https://www.eclipse.org/jgit/download/

Report message to a moderator

Re: Stash apply result in conflicts even there are no conflicts different from command line [message #1729531 is a reply to message #1729527]

Fri, 15 April 2016 07:41

kishore routhu

Messages: 4
Registered: March 2014

Junior Member

As you suggested i moved to version 4.1.2.201602141800-r. But still i am facing the issue.
In which version it was fixed.
It is giving the dirty index for local changes even the index is not dirty.

Report message to a moderator

Re: Stash apply result in conflicts even there are no conflicts different from command line [message #1729543 is a reply to message #1729531]

Fri, 15 April 2016 09:42

kishore routhu

Messages: 4
Registered: March 2014

Junior Member

As suggested i just tried using version 4.3.0.201604071810-r. But still issue exist.
I am getting same problem.
What is the solution you suggest for this ?

Report message to a moderator