Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
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)
icon13.gif  Stash apply result in conflicts even there are no conflicts different from command line [message #1729444] Thu, 14 April 2016 08:43 Go to next message
kishore routhu is currently offline kishore routhuFriend
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 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1026
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/
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 Go to previous messageGo to next message
kishore routhu is currently offline kishore routhuFriend
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.
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 Go to previous messageGo to next message
kishore routhu is currently offline kishore routhuFriend
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 ?
Re: Stash apply result in conflicts even there are no conflicts different from command line [message #1750874 is a reply to message #1729543] Fri, 30 December 2016 13:47 Go to previous message
roland polzer is currently offline roland polzerFriend
Messages: 2
Registered: December 2016
Junior Member
I have the same issue. Apply stashed changes never worked. In all version up to neon.2
Previous Topic: Blocking Git commit when special tag found in code
Next Topic:Git Staging not working for some users in Eclipse Luna
Goto Forum:
  


Current Time: Mon Jun 25 08:35:35 GMT 2018

Powered by FUDForum. Page generated in 0.01521 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top